Commit 4ff4f61a authored by Pavol Strizenec's avatar Pavol Strizenec Committed by Graeme Stewart
Browse files

adapting to cabling move out of LArTools (LArCafJobs-01-02-00)

	* adapting to cabling move out of LArTools
	* to be used in rel. 21.
	* tag LArCafJobs-01-02-00

29-05-2016 Pavol Strizenec <pavol @ mail.cern.ch>
	* fix Coverity 109099
	* tag LArCafJobs-01-01-02

25-05-2016 Pavol Strizenec <pavol @ mail.cern.ch>
	* moving LArNoiseBurst here
	* creating LArHECNoise algo
	* to be working with rel. 20.7.6.4 and higher
	* tag LArCafJobs-01-01-00
	* tag LArCafJobs-01-01-01

20-10-2015 Pavol Strizenec <pavol @ mail.cern.ch>
	* proper ADC2MeV tool for skeleton
	* tag LArCafJobs-01-00-61

2015-10-07 Walter Lampl <walter.lampl@ cern.ch>
...
(Long ChangeLog diff - truncated)
parent 62593c07
......@@ -12,30 +12,45 @@ atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/SGTools
Control/StoreGate
Calorimeter/CaloDetDescr
Calorimeter/CaloInterface
DetectorDescription/Identifier
External/AtlasCLHEP
External/AtlasHepMC
GaudiKernel
LArCalorimeter/LArIdentifier
LArCalorimeter/LArRawConditions
LArCalorimeter/LArRawEvent
LArCalorimeter/LArRecUtils
LArCalorimeter/LArRecConditions
LArCalorimeter/LArTools
LArCalorimeter/LArCabling
PhysicsAnalysis/AnalysisCommon/AnalysisTools
PhysicsAnalysis/TruthParticleID/McParticleEvent
Reconstruction/egamma/egammaEvent
Tools/PyJobTransformsCore
Trigger/TrigAnalysis/TrigAnalysisInterfaces
Trigger/TrigAnalysis/TrigDecisionTool
Trigger/TrigConfiguration/TrigConfInterfaces
Trigger/TrigEvent/TrigSteeringEvent
PRIVATE
Calorimeter/CaloDetDescr
Calorimeter/CaloInterface
Calorimeter/CaloEvent
Database/AthenaPOOL/AthenaPoolUtilities
DataQuality/DataQualityUtils
DetectorDescription/Identifier
Event/xAOD/xAODEventInfo
Event/NavFourMom
LArCalorimeter/LArElecCalib
LArCalorimeter/LArRecConditions
LArCalorimeter/LArCondUtils
LArCalorimeter/LArRecEvent
LArCalorimeter/LArGeoModel/LArHV
LArCalorimeter/LArGeoModel/LArReadoutGeometry
Trigger/TrigConfiguration/TrigConfHLTData
Trigger/TrigT1/TrigT1Result )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( ROOT COMPONENTS Matrix Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
find_package( HepMC )
# tag ROOTBasicLibs was not recognized in automatic conversion in cmt2cmake
......@@ -58,20 +73,22 @@ atlas_add_library( LArCafJobsLib
src/RunData.cxx
src/ShapeInfo.cxx
src/SimpleShape.cxx
src/LArNoiseBursts.cxx
src/LArHECNoise.cxx
PUBLIC_HEADERS LArCafJobs
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES CaloIdentifier AthenaBaseComps SGTools GaudiKernel LArIdentifier LArRawConditions LArRawEvent TrigSteeringEvent StoreGateLib SGtests LArRecUtilsLib LArToolsLib TrigDecisionToolLib CaloDetDescrLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result )
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES CaloIdentifier AthenaBaseComps SGTools GaudiKernel LArIdentifier LArRawConditions LArRawEvent egammaEvent TrigSteeringEvent McParticleEvent StoreGateLib SGtests LArRecUtilsLib LArToolsLib TrigDecisionToolLib CaloDetDescrLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result ${HEPMC_LIBRARIES} )
atlas_add_component( LArCafJobs
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps SGTools StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArRecUtilsLib LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps SGTools StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent egammaEvent LArRecUtilsLib LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
atlas_add_dictionary( LArCafJobsDict
LArCafJobs/LArCafJobsDict.h
LArCafJobs/selection.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps SGTools StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArRecUtilsLib LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
atlas_add_executable( LArQuickHistMerge
......@@ -87,5 +104,5 @@ atlas_add_executable( LArSamplesMerge
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( share/LArHistMerge_trf.py )
atlas_install_scripts( share/LArHistMerge_trf.py share/LArCAF_tf.py share/LArNoiseBursts_tf.py )
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LArHECNoise_H
#define LArHECNoise_H
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/AlgTool.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AnalysisTools/AnalysisTools.h"
//LAr services:
#include "Identifier/Range.h"
#include "Identifier/IdentifierHash.h"
#include "LArRecConditions/ILArBadChannelMasker.h"
#include "CaloInterface/ICaloNoiseTool.h"
#include "CaloInterface/ICalorimeterNoiseTool.h"
#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
#include "LArTools/LArCablingService.h"
#include "LArCabling/LArHVCablingTool.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArElectrodeID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "LArElecCalib/ILArPedestal.h"
// Trigger
#include "TrigDecisionTool/TrigDecisionTool.h"
//STL:
#include <string>
#include <bitset>
class LArOnlineID;
class LArElectrodeID;
class HWIdentifier;
class LArCablingService;
class LArEM_ID;
class LArHEC_ID;
class LArFCAL_ID;
class TTree;
class LArHECNoise : public AthAlgorithm {
public:
LArHECNoise(const std::string& name, ISvcLocator* pSvcLocator);
~LArHECNoise();
virtual StatusCode initialize();
virtual StatusCode finalize();
virtual StatusCode execute();
private:
ITHistSvc * m_thistSvc;
TTree* m_tree;
/*Tools*/
ToolHandle<LArCablingService> m_LArCablingService;
ToolHandle<ICaloNoiseTool> m_calo_noise_tool;
ToolHandle<Trig::IBunchCrossingTool> m_bc_tool;
ToolHandle< Trig::TrigDecisionTool > m_trigDec;
/*services*/
const LArOnlineID* m_LArOnlineIDHelper;
const CaloIdManager* m_caloIdMgr;
const CaloDetDescrManager* m_calodetdescrmgr;
const CaloCell_ID* m_calocell_id;
/*declaration of branches*/
int m_nt_run ;
int m_nt_evtId;
int m_nt_evtCount;
int m_nt_evtTime;
int m_nt_evtTime_ns;
int m_nt_lb;
int m_nt_bcid;
int m_nt_gain;
int m_nt_side;
int m_nt_samp;
int m_nt_reg;
int m_nt_ieta;
int m_nt_iphi;
int m_nt_quality;
short m_nt_digi[32];
int m_nt_max;
int m_nt_min;
long m_nt_OID;
float m_nt_avgMu;
float m_nt_actMu;
float m_nt_e;
float m_nt_t;
float m_nt_eta;
float m_nt_phi;
float m_nt_z;
float m_nt_r;
float m_nt_ped;
float m_nt_pedRMS;
float *m_nt_prescale;
bool *m_nt_trigger;
// other members
std::vector<std::string> m_TriggerLines;
int m_MinDigitADC;
int m_MaxDeltaT;
const DataHandle<ILArPedestal> m_ped;
};
#endif // LArHECNoise_H
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LArNoiseBursts_H
#define LArNoiseBursts_H
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/AlgTool.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AnalysisTools/AnalysisTools.h"
//LAr services:
#include "Identifier/Range.h"
#include "Identifier/IdentifierHash.h"
//#include "Identifier/HWIdentifier.h"
//#include "LArElecCalib/ILArPedestal.h"
#include "LArRecConditions/ILArBadChannelMasker.h"
#include "CaloInterface/ICaloNoiseTool.h"
#include "CaloInterface/ICalorimeterNoiseTool.h"
#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
#include "LArTools/LArCablingService.h"
#include "LArCabling/LArHVCablingTool.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArElectrodeID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloIdentifier/CaloIdManager.h"
//#include "LArCondUtils/LArHVToolDB.h"
//#include "LArElecCalib/ILArHVTool.h"
// Trigger
#include "TrigDecisionTool/TrigDecisionTool.h"
// Electrons
#include "egammaEvent/ElectronContainer.h"
//CBNT_UTILS
//#include "CBNT_Utils/CBNT_AthenaAwareBase.h"
//#include "AthenaBaseComps/AthAlgorithm.h"
//STL:
#include <string>
#include <bitset>
class LArOnlineID;
class LArElectrodeID;
class HWIdentifier;
class LArOnlineIDStrHelper;
class LArCablingService;
class LArEM_ID;
class LArHEC_ID;
class LArFCAL_ID;
//class CaloIdManager;
//class CaloDetDescrManager;
class TileTBID;
class TgcIdHelper;
class TTree;
class LArHVLineID;
class LArNoiseBursts : public AthAlgorithm {
public:
LArNoiseBursts(const std::string& name, ISvcLocator* pSvcLocator);
~LArNoiseBursts();
//virtual StatusCode initializeBeforeEventLoop();
virtual StatusCode initialize();
virtual StatusCode finalize();
virtual StatusCode execute();
virtual StatusCode clear();
private:
/** methods called by execute() */
StatusCode doTrigger();
StatusCode doEventProperties();
StatusCode doLArNoiseBursts();
StatusCode doPhysicsObjects();
//functions
int GetPartitionLayerIndex(const Identifier& id);
std::vector<int>* GetHVLines(const Identifier& id);
private:
ITHistSvc * m_thistSvc;
TTree* m_tree;
/*Tools*/
ToolHandle<LArCablingService> m_LArCablingService;
ToolHandle<LArHVCablingTool> m_LArHVCablingTool;
ToolHandle<ICaloNoiseTool> m_calo_noise_tool;
ToolHandle<Trig::IBunchCrossingTool> m_bc_tool;
ToolHandle< Trig::TrigDecisionTool > m_trigDec;
/*services*/
const LArOnlineID* m_LArOnlineIDHelper;
const LArHVLineID* m_LArHVLineIDHelper;
const LArElectrodeID* m_LArElectrodeIDHelper;
const LArEM_ID* m_LArEM_IDHelper;
const LArFCAL_ID* m_LArFCAL_IDHelper;
const LArHEC_ID* m_LArHEC_IDHelper;
const CaloIdManager* m_caloIdMgr;
const CaloDetDescrManager* m_calodetdescrmgr;
// Electrons
std::string m_elecContainerName;
/*event cuts */
double m_sigmacut;
bool m_CosmicCaloStream;
int m_frontbunches;
bool m_keepOnlyCellID;
/*declaration of branches*/
int m_nb_sat;
int m_lowqfactor;
int m_medqfactor;
int m_hiqfactor;
long n_noisycell;
int m_nt_larcellsize;
int m_nt_cellsize;
int m_nt_run ;
int m_nt_evtId;
int m_nt_evtTime;
int m_nt_evtTime_ns;
int m_nt_lb;
int m_nt_bcid;
int m_nt_ntracks;
int m_nt_isbcidFilled;
int m_nt_isbcidInTrain;
std::vector<int> m_nt_isBunchesInFront;
int m_nt_bunchtype;
float m_nt_bunchtime;
unsigned int m_nt_atlasready;
unsigned int m_nt_stablebeams;
std::vector<std::string> m_nt_streamTagName;
std::vector<std::string> m_nt_streamTagType;
short m_nt_larnoisyro;
short m_nt_larnoisyro_opt;
short m_nt_larnoisyro_satTwo;
//event info veto variables
// short m_nt_veto_mbts;
// //short m_nt_veto_indet;
// short m_nt_veto_bcm;
// short m_nt_veto_lucid;
// short m_nt_veto_pixel;
// short m_nt_veto_sct;
// short m_nt_veto_mbtstdHalo;
// short m_nt_veto_mbtstdCol;
// short m_nt_veto_lartdHalo;
// short m_nt_veto_lartdCol;
// short m_nt_veto_csctdHalo;
// short m_nt_veto_csctdCol;
// short m_nt_veto_bcmtHalo;
// short m_nt_veto_bcmtCol;
// short m_nt_veto_muontCol;
// short m_nt_veto_muontCosmic;
// LAr event bit info
bool m_nt_larflag_badFEBs;
bool m_nt_larflag_mediumSaturatedDQ;
bool m_nt_larflag_tightSaturatedDQ;
bool m_nt_larflag_noiseBurstVeto;
bool m_nt_larflag_dataCorrupted;
bool m_nt_larflag_dataCorruptedVeto;
// NoiseBurst trigger
bool m_nt_L1_J75;
bool m_nt_L1_J10_EMPTY;
bool m_nt_L1_J30_FIRSTEMPTY;
bool m_nt_L1_J30_EMPTY;
bool m_nt_L1_XE40;
bool m_nt_L1_XE50;
bool m_nt_L1_XE50_BGRP7;
bool m_nt_L1_XE70;
bool m_nt_EF_j165_u0uchad_LArNoiseBurst;
bool m_nt_EF_j30_u0uchad_empty_LArNoiseBurst;
bool m_nt_EF_j55_u0uchad_firstempty_LArNoiseBurst;
bool m_nt_EF_j55_u0uchad_empty_LArNoiseBurst;
bool m_nt_EF_xe45_LArNoiseBurst;
bool m_nt_EF_xe55_LArNoiseBurst;
bool m_nt_EF_xe60_LArNoiseBurst;
bool m_nt_EF_j55_u0uchad_firstempty_LArNoiseBurstT;
bool m_nt_EF_j100_u0uchad_LArNoiseBurstT;
bool m_nt_EF_j165_u0uchad_LArNoiseBurstT;
bool m_nt_EF_j130_u0uchad_LArNoiseBurstT;
bool m_nt_EF_j35_u0uchad_empty_LArNoiseBurst;
bool m_nt_EF_j35_u0uchad_firstempty_LArNoiseBurst;
bool m_nt_EF_j80_u0uchad_LArNoiseBurstT;
//LAr Time variables
float m_nt_ECTimeDiff;
float m_nt_ECTimeAvg;
int m_nt_nCellA;
int m_nt_nCellC;
//Quantites for noisy cells
std::vector<float> m_nt_energycell;
std::vector<float> m_nt_qfactorcell;
std::vector<float> m_nt_phicell;
std::vector<float> m_nt_etacell;
std::vector<float> m_nt_signifcell;
float m_nt_noisycellpercent;
std::vector<short> m_nt_ft_noisy;
std::vector<short> m_nt_slot_noisy;
std::vector<short> m_nt_channel_noisy;
std::vector<short> m_nt_cellpartlayerindex;
std::vector< unsigned int > m_nt_cellIdentifier;
std::vector<float> m_nt_noisycellpart;
std::vector<int> m_nt_nominalhv;
std::vector<int> m_nt_maximalhv;
std::vector<int> m_nt_noisycellHVphi;
std::vector<int> m_nt_noisycellHVeta;
std::vector<std::vector<short> > m_nt_samples;
std::vector<int> m_nt_gain;
std::vector<int> m_nt_isbadcell;
/*
std::vector<int> m_nt_isbarrel;
std::vector<int> m_nt_isendcap;
std::vector<int> m_nt_isfcal;
std::vector<int> m_nt_ishec;
*/
std::vector<int> m_nt_partition;
std::vector<int> m_nt_layer;
//Quanties for the saturated cells
std::vector<int> m_nt_isbadcell_sat;
std::vector<int> m_nt_barrelec_sat;
std::vector<int> m_nt_posneg_sat;
std::vector<short> m_nt_ft_sat;
std::vector<short> m_nt_slot_sat;
std::vector<short> m_nt_channel_sat;
std::vector<int> m_nt_partition_sat;
std::vector<float> m_nt_energy_sat;
std::vector<float> m_nt_phicell_sat;
std::vector<float> m_nt_etacell_sat;
std::vector<int> m_nt_layer_sat;
std::vector<unsigned int> m_nt_cellIdentifier_sat;
};
#endif // LArNoiseBursts_H
......@@ -33,6 +33,7 @@
#include "TTree.h"
#include "TRandom.h"
#include "TrigConfInterfaces/ITrigConfigSvc.h"
#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
#include "LArCafJobs/ILArShapeDumperTool.h"
class MsgStream;
......@@ -79,8 +80,14 @@ class LArShapeDumper : public AthAlgorithm
std::string m_fileName;
int m_prescale;
int m_count;
int m_maxChannels;
unsigned m_count;
unsigned m_maxChannels;
unsigned m_nWrongBunchGroup;
unsigned m_nPrescaledAway;
unsigned m_nLArError;
unsigned m_nNoDigits;
std::string m_digitsKey, m_channelsKey;
std::string m_caloType; // EM, HEC, FCAL
double m_energyCut, m_noiseSignifCut;
......@@ -97,8 +104,11 @@ class LArShapeDumper : public AthAlgorithm
ToolHandle<ILArADC2MeVTool> m_adc2mevTool;
ToolHandle<LArOFPeakRecoTool> m_peakReco;
ToolHandle<Trig::TrigDecisionTool> m_trigDec;
ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; // for tests...
ToolHandle<Trig::IBunchCrossingTool> m_bcidTool;
const ILArPedestal* m_larPedestal;
const CaloDetDescrManager* m_caloDetDescrMgr;
......@@ -111,6 +121,8 @@ class LArShapeDumper : public AthAlgorithm
bool m_doEM, m_doHEC, m_doFCAL;
bool m_gains[CaloGain::LARNGAIN];
bool m_onlyEmptyBC;
LArSamples::DataStore* m_samples;
LArSamples::RunData* m_runData;
std::vector<const Trig::ChainGroup*> m_triggerGroups;
......
......@@ -13,6 +13,7 @@ use LArRawEvent LArRawEvent-* LArCalorimeter
use LArRawConditions LArRawConditions-* LArCalorimeter
use LArRecUtils LArRecUtils-* LArCalorimeter
use LArTools LArTools-* LArCalorimeter
use LArCabling LArCabling-* LArCalorimeter
use PyJobTransformsCore PyJobTransformsCore-* Tools
use StoreGate StoreGate-* Control
use TrigDecisionTool TrigDecisionTool-* Trigger/TrigAnalysis
......@@ -20,6 +21,17 @@ use TrigSteeringEvent TrigSteeringEvent-* Trigger/TrigEvent
use TrigConfInterfaces TrigConfInterfaces-* Trigger/TrigConfiguration
use LArElecCalib LArElecCalib-* LArCalorimeter
use LArIdentifier LArIdentifier-* LArCalorimeter
use TrigAnalysisInterfaces TrigAnalysisInterfaces-* Trigger/TrigAnalysis
use CaloDetDescr CaloDetDescr-* Calorimeter
use CaloInterface CaloInterface-* Calorimeter
use Identifier Identifier-* DetectorDescription
use LArRecConditions LArRecConditions-* LArCalorimeter
use AnalysisTools AnalysisTools-* PhysicsAnalysis/AnalysisCommon
use AtlasCLHEP AtlasCLHEP-* External
use egammaEvent egammaEvent-* Reconstruction/egamma
use AtlasHepMC AtlasHepMC-* External
apply_tag ROOTBasicLibs
apply_tag ROOTGraphicsLibs
......@@ -28,7 +40,7 @@ apply_tag ROOTMathLibs
# Specify the required ROOT components for cmake (transparent to CMT)
apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Matrix)"
apply_pattern dual_use_library files="AbsShape.cxx CaloId.cxx CellInfo.cxx ClassCounts.cxx DataContainer.cxx DataStore.cxx Definitions.cxx EventData.cxx Geometry.cxx HistoryContainer.cxx LArShapeDumper.cxx LArShapeDumperTool.cxx LArSimpleShapeDumper.cxx PersistentAccessor.cxx RunData.cxx ShapeInfo.cxx SimpleShape.cxx "
apply_pattern dual_use_library files="AbsShape.cxx CaloId.cxx CellInfo.cxx ClassCounts.cxx DataContainer.cxx DataStore.cxx Definitions.cxx EventData.cxx Geometry.cxx HistoryContainer.cxx LArShapeDumper.cxx LArShapeDumperTool.cxx LArSimpleShapeDumper.cxx PersistentAccessor.cxx RunData.cxx ShapeInfo.cxx SimpleShape.cxx LArNoiseBursts.cxx LArHECNoise.cxx"
......@@ -41,18 +53,22 @@ apply_pattern declare_scripts files="LArHistMerge_trf.py"
private
use AtlasReflex AtlasReflex-* External -no_auto_imports
use CaloDetDescr CaloDetDescr-* Calorimeter
use DataQualityUtils DataQualityUtils-* DataQuality
use Identifier Identifier-* DetectorDescription
use LArRecConditions LArRecConditions-* LArCalorimeter
use TrigT1Result TrigT1Result-* Trigger/TrigT1
use AtlasBoost AtlasBoost-* External
use CaloInterface CaloInterface-* Calorimeter
use xAODEventInfo xAODEventInfo-* Event/xAOD
use LArElecCalib LArElecCalib-* LArCalorimeter
use TrigConfHLTData TrigConfHLTData-* Trigger/TrigConfiguration
use LArCondUtils LArCondUtils-* LArCalorimeter
use CaloEvent CaloEvent-* Calorimeter
use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
use LArHV LArHV-* LArCalorimeter/LArGeoModel
use LArReadoutGeometry LArReadoutGeometry-* LArCalorimeter/LArGeoModel
use LArRecEvent LArRecEvent-* LArCalorimeter/LArRecEvent
use NavFourMom NavFourMom-* Event
# for dbg
#private
#macro cppdebugflags '$(cppdebugflags_s)'
......@@ -67,5 +83,5 @@ macro_append LArQuickHistMerge_dependencies " LArCafJobsLib"
application LArSamplesMerge ../src/LArSamplesMerge.cxx
macro_append LArSamplesMerge_dependencies " LArCafJobsLib"
apply_pattern declare_jobtransforms trfs='../share/LArCAF_tf.py ../share/LArMerge_trf.py' jo='skeleton.LArCAF.py'
apply_pattern declare_jobtransforms trfs='../share/LArNoiseBursts_tf.py ../share/LArCAF_tf.py ../share/LArMerge_trf.py' jo='skeleton.LArCAF.py'
......@@ -110,7 +110,7 @@ def getLBsToIgnore(runnum,burstsFromCosmic=True,bulkProcessing=False, dropNonRea
multicall = xmlrpclib.MultiCall(server)
run_spec = {'source': source, 'high_run': runnum, 'stream': stream, 'proc_ver': proc, 'low_run': runnum}
multicall.get_dqmf_all_results(run_spec,'LAr/LAR_GLOBAL/Collisions/LArCollTimeLumiBlockTimeCut')
multicall.get_dqmf_all_results(run_spec,'LAr/LAR_GLOBAL/Collisions-Bkg/LArCollTimeLumiBlockTimeCut')
results = multicall()
RE = re.compile(r'\((?P<lb>\S+)\.0*\)')
......@@ -134,12 +134,14 @@ def getLBsToIgnore(runnum,burstsFromCosmic=True,bulkProcessing=False, dropNonRea
histoName = {'EMBC':'BarrelC','EMBA':'BarrelA','EMECC':'EMECC','EMECA':'EMECA'}
for iPart in histoName.keys():
multicall = xmlrpclib.MultiCall(server)
multicall.get_dqmf_all_results(run_spec,'LAr/%s/Noise/Partition/NoisyEvent_TimeVeto_%s'%(iPart,histoName[iPart]))
#multicall.get_dqmf_all_results(run_spec,'LAr/%s/Noise/Partition/NoisyEvent_TimeVeto_%s'%(iPart,histoName[iPart]))
multicall.get_dqmf_all_results(run_spec,'/LAr/%s/Occupancy-Noise/Noise_Burst/NoisyEvent_TimeVeto_%s'%(iPart,iPart))
results = multicall()
try:
list = results[0][str(runnum)]
resultlist = results[0][str(runnum)]