diff --git a/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py index 1f4183b57fda21fa7393371fd26d1e016ba608f9..474d45e18396732b867c00f9352d80b8d02c0dfa 100755 --- a/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py +++ b/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py @@ -37,7 +37,7 @@ LArCollisionTimeMon = LArCollisionTimeMonTool( LArCluCollTimeMonTool=LArCollisionTimeMonTool(Key="ClusterCollTime", - histPath="LArClusterCollTime", + histPath="LArClusterCollTimeOldTool", nCells=0, m_lumi_blocks=3000, BunchCrossingTool = theBunchCrossingTool, diff --git a/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py index da016a6b05fb7f835bfe52c6b97cea054eca130f..d212701429d7869d0d6554f7b7656d37096e3a17 100755 --- a/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py +++ b/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py @@ -6,7 +6,7 @@ ToolSvc.LArDigitNoiseMonTool.regionIDs = [0] # [0] to turn on all regions, [] to from LArMonTools.LArMonToolsConf import LArFebNoiseMonTool theLArFebNoiseMonTool = LArFebNoiseMonTool(name="LArFebNoiseMonTool", LArDigitContainerKey = LArMonFlags.LArDigitKey(), - histoPathBase = "LAr/FebNoise", + histoPathBase = "LAr/FebNoiseOldTool", febIDs = [ 0 ], TriggerSign = +1, AlternateSum = False, @@ -24,7 +24,7 @@ LArMon.AthenaMonTools+=[ theLArFebNoiseMonTool ] from LArMonTools.LArMonToolsConf import LArFebNoiseMonTool theLArFebNoiseMonToolAlt = LArFebNoiseMonTool(name="LArFebNoiseMonToolAlt", LArDigitContainerKey = LArMonFlags.LArDigitKey(), - histoPathBase = "LAr/FebNoiseAlt", + histoPathBase = "LAr/FebNoiseAltOldTool", febIDs = [ 0 ], TriggerSign = +1, AlternateSum = True, diff --git a/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py index 214f9c2cd6c24df164ef477d83c01c050f6553b4..b840058010b2bc398dfc8293fa86107c34e3df49 100755 --- a/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py +++ b/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py @@ -19,7 +19,7 @@ LArRawChannelMon = LArRawChannelMonTool( # --- set up mon tool --- name = "LArRawChannelMon", LArRawChannelContainerKey = "LArRawChannels", - histoPathBase = "LAr/RawChannel", + histoPathBase = "LAr/RawChannelOldTool", OutputLevel = 3, # ATLAS Ready Filter Tool diff --git a/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx b/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx index 09880c6308e9a41367f724cd76e0f0f5142b7664..6b89ea80ed5beb75a29d411d2915dd211bbdae24 100644 --- a/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx +++ b/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx @@ -108,7 +108,7 @@ LArAffectedRegions::bookHistograms() // if(isNewRun ){ // Commented by B.Trocme to comply with new ManagedMonitorToolBase // Create top folder for histos - MonGroup generalGroup( this, "/LAr/AffectedRegions", run, ATTRIB_MANAGED,"", "weightedAverage"); + MonGroup generalGroup( this, "/LAr/AffectedRegionsOldTool", run, ATTRIB_MANAGED,"", "weightedAverage"); // EM Calorimeter - Barrel - PS m_hLArAffectedRegionsEMBPS[0] = TH2I_LW::create("LArAffectedRegionsEMBAPS", diff --git a/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx index db4ff004b799d58df2d76b5fa5f1de80126c307c..37e576c33e6a78840aa81e8982261bc3f2236b37 100755 --- a/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx +++ b/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx @@ -58,7 +58,7 @@ LArCollisionTimeMonTool::LArCollisionTimeMonTool(const std::string& type, declareProperty( "timeDiffCut" , m_timeCut = 5.0 ); declareProperty( "nCells" , m_minCells = 2 ); declareProperty( "eWeighted" , m_eWeighted = true ); - declareProperty( "histPath" , m_histPath="LArCollisionTime"); + declareProperty( "histPath" , m_histPath="LArCollisionTimeOldTool"); declareProperty( "BunchCrossingTool" , m_bunchGroupTool); declareProperty( "TrainFrontDistance" , m_distance = 30); declareProperty( "IsOnline" , m_IsOnline=false); diff --git a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx index 490e4ee771cab162b78ec2b9da9387066f533d7d..3c6eee2097a8cac93668bdf26d0caa8382f9889a 100644 --- a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx +++ b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx @@ -130,7 +130,7 @@ LArCosmicsMonTool::bookHistograms() { // Create top folder for histos // - MonGroup generalGroupShift( this, "/LAr/Cosmics/", run, ATTRIB_MANAGED ); + MonGroup generalGroupShift( this, "/LAr/CosmicsOldTool/", run, ATTRIB_MANAGED ); // Store cells granularity and plots boundaries for each sampling in ECAL float etaminECAL = -3.2 ; float etamaxECAL = 3.2; diff --git a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx index 698da2bed0039ebe6c146c7e0ae2d042e677a0cb..fa06b3c6a834ac55336ecd55490cc439046340cc 100644 --- a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx +++ b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx @@ -136,12 +136,12 @@ LArCoverage::bookHistograms() } // Create top folder for histos - MonGroup generalGroup( this, "/LAr/Coverage", run, ATTRIB_MANAGED ); + MonGroup generalGroup( this, "/LAr/CoverageOldTool", run, ATTRIB_MANAGED ); // // Book Maps vs eta/phi - One map per sampling // - MonGroup CovGroupShift( this, "/LAr/Coverage/perPartition", run, ATTRIB_MANAGED, "", "lowerLB" ); + MonGroup CovGroupShift( this, "/LAr/CoverageOldTool/perPartition", run, ATTRIB_MANAGED, "", "lowerLB" ); // // Coverage EM Barrel - Store Granularity @@ -471,7 +471,7 @@ LArCoverage::bookHistograms() // CaloNoiseTool histograms - per FT/Slot // - MonGroup CaloNoiseGroupShift( this, "/LAr/Coverage/CaloNoiseTool", run, ATTRIB_MANAGED, "", "lowerLB"); + MonGroup CaloNoiseGroupShift( this, "/LAr/CoverageOldTool/CaloNoiseTool", run, ATTRIB_MANAGED, "", "lowerLB"); // EM histos for (int i=0; i<4;i++){ @@ -507,7 +507,7 @@ LArCoverage::bookHistograms() // Bad Channels DataBase content // - MonGroup BadChannelsGroupShift( this, "/LAr/Coverage/BadChannels/", run, ATTRIB_MANAGED, "", "lowerLB"); + MonGroup BadChannelsGroupShift( this, "/LAr/CoverageOldTool/BadChannels/", run, ATTRIB_MANAGED, "", "lowerLB"); m_hBadChannelsBarrelA = TH2I_LW::create("DBBadChannelsBarrelA",Form("Known Bad Channels - Barrel A - LB %4d",lb1), 448,0.,32.,128,-0.5,127.5); diff --git a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx index 459e3751f3b8254f62dcad45e1f5825998f911df..c7695a6c1a188b96eb39a4579b22fff57c492276 100755 --- a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx +++ b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx @@ -203,40 +203,40 @@ LArDigitMon::bookHistograms() m_eventsCounter=0; /**Book Histograms of Barrel.*/ - MonGroup GroupBarrelShift( this, "/LAr/Digits/Barrel", run, ATTRIB_MANAGED ); - MonGroup GroupBarrelExpert( this, "/LAr/Digits/Barrel", run, ATTRIB_MANAGED ); - MonGroup GroupBarrelExpertEff( this, "/LAr/Digits/Barrel", run, ATTRIB_MANAGED ,"","weightedEff"); + MonGroup GroupBarrelShift( this, "/LAr/DigitsOldTool/Barrel", run, ATTRIB_MANAGED ); + MonGroup GroupBarrelExpert( this, "/LAr/DigitsOldTool/Barrel", run, ATTRIB_MANAGED ); + MonGroup GroupBarrelExpertEff( this, "/LAr/DigitsOldTool/Barrel", run, ATTRIB_MANAGED ,"","weightedEff"); LArDigitMon::BookPartitions(m_BarrelA,"BarrelA",GroupBarrelShift,GroupBarrelExpert,GroupBarrelExpertEff); LArDigitMon::BookPartitions(m_BarrelC,"BarrelC",GroupBarrelShift,GroupBarrelExpert,GroupBarrelExpertEff); /**Book Histogram of EMEC*/ - MonGroup GroupEMECShift( this, "/LAr/Digits/EMEC", run, ATTRIB_MANAGED ); - MonGroup GroupEMECExpert( this, "/LAr/Digits/EMEC", run, ATTRIB_MANAGED ); - MonGroup GroupEMECExpertEff( this, "/LAr/Digits/EMEC", run, ATTRIB_MANAGED,"","weightedEff"); + MonGroup GroupEMECShift( this, "/LAr/DigitsOldTool/EMEC", run, ATTRIB_MANAGED ); + MonGroup GroupEMECExpert( this, "/LAr/DigitsOldTool/EMEC", run, ATTRIB_MANAGED ); + MonGroup GroupEMECExpertEff( this, "/LAr/DigitsOldTool/EMEC", run, ATTRIB_MANAGED,"","weightedEff"); LArDigitMon::BookPartitions(m_EmecA,"EmecA",GroupEMECShift,GroupEMECExpert,GroupEMECExpertEff); LArDigitMon::BookPartitions(m_EmecC,"EmecC",GroupEMECShift,GroupEMECExpert,GroupEMECExpertEff); /**Book Histogram of HEC*/ - MonGroup GroupHECShift( this, "/LAr/Digits/HEC", run, ATTRIB_MANAGED ); - MonGroup GroupHECExpert( this, "/LAr/Digits/HEC", run, ATTRIB_MANAGED ); - MonGroup GroupHECExpertEff( this, "/LAr/Digits/HEC", run, ATTRIB_MANAGED,"","weightedEff"); + MonGroup GroupHECShift( this, "/LAr/DigitsOldTool/HEC", run, ATTRIB_MANAGED ); + MonGroup GroupHECExpert( this, "/LAr/DigitsOldTool/HEC", run, ATTRIB_MANAGED ); + MonGroup GroupHECExpertEff( this, "/LAr/DigitsOldTool/HEC", run, ATTRIB_MANAGED,"","weightedEff"); LArDigitMon::BookPartitions(m_HecA,"HecA",GroupHECShift,GroupHECExpert,GroupHECExpertEff); LArDigitMon::BookPartitions(m_HecC,"HecC",GroupHECShift,GroupHECExpert,GroupHECExpertEff); /**Book Histogram of FCAL.*/ - MonGroup GroupFCALShift( this, "/LAr/Digits/FCAL", run, ATTRIB_MANAGED ); - MonGroup GroupFCALExpert( this, "/LAr/Digits/FCAL", run, ATTRIB_MANAGED ); - MonGroup GroupFCALExpertEff( this, "/LAr/Digits/FCAL", run, ATTRIB_MANAGED,"","weightedEff"); + MonGroup GroupFCALShift( this, "/LAr/DigitsOldTool/FCAL", run, ATTRIB_MANAGED ); + MonGroup GroupFCALExpert( this, "/LAr/DigitsOldTool/FCAL", run, ATTRIB_MANAGED ); + MonGroup GroupFCALExpertEff( this, "/LAr/DigitsOldTool/FCAL", run, ATTRIB_MANAGED,"","weightedEff"); LArDigitMon::BookPartitions(m_FcalA,"FcalA",GroupFCALShift,GroupFCALExpert,GroupFCALExpertEff); LArDigitMon::BookPartitions(m_FcalC,"FcalC",GroupFCALShift,GroupFCALExpert,GroupFCALExpertEff); /**Book summary histo*/ - MonGroup generalGroup( this, "/LAr/Digits", run, ATTRIB_MANAGED ); + MonGroup generalGroup( this, "/LAr/DigitsOldTool", run, ATTRIB_MANAGED ); const char * hName = "summary"; const char * hTitle = "LArDigit Summary"; diff --git a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx index 0aa4592d192facbe6d00605fa81d775f4316a71c..43aa03f8aa6259b8c6e0f15bd19cce40b7b4f420 100755 --- a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx +++ b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx @@ -159,10 +159,10 @@ StatusCode LArFEBMon::bookHistograms() { StatusCode sc = StatusCode::SUCCESS; // if(isNewRun){ - MonGroup summaryGroupW( this, "/LAr/FEBMon/Summary", run, ATTRIB_MANAGED, "", "weightedEff" ); - MonGroup summaryGroup( this, "/LAr/FEBMon/Summary", run, ATTRIB_MANAGED ); - MonGroup perPartitionDataGroup( this, "/LAr/FEBMon/perPartitionData", run, ATTRIB_MANAGED ); - MonGroup perPartitionDataGroupLowerLB( this, "/LAr/FEBMon/perPartitionData", run, ATTRIB_MANAGED, "", "lowerLB" ); + MonGroup summaryGroupW( this, "/LAr/FEBMonOldTool/Summary", run, ATTRIB_MANAGED, "", "weightedEff" ); + MonGroup summaryGroup( this, "/LAr/FEBMonOldTool/Summary", run, ATTRIB_MANAGED ); + MonGroup perPartitionDataGroup( this, "/LAr/FEBMonOldTool/perPartitionData", run, ATTRIB_MANAGED ); + MonGroup perPartitionDataGroupLowerLB( this, "/LAr/FEBMonOldTool/perPartitionData", run, ATTRIB_MANAGED, "", "lowerLB" ); // General summary histos m_rejectedHisto = TH1F_LW::create("EventsRejected","Nb of events rejected (at least one error)",3,0.5,3.5); (m_rejectedHisto->GetXaxis())->SetBinLabel(1,"Whole event corrupted"); @@ -170,7 +170,7 @@ StatusCode LArFEBMon::bookHistograms() { (m_rejectedHisto->GetXaxis())->SetBinLabel(3,"Accepted"); //sc &= summaryGroup.regHist(m_rejectedHisto); - sc = regHist(m_rejectedHisto, "/LAr/FEBMon/Summary", run); + sc = regHist(m_rejectedHisto, "/LAr/FEBMonOldTool/Summary", run); m_rejectedYield = TH1F_LW::create("EventsRejectedYield","Data corruption yield",3,0.5,3.5); (m_rejectedYield->GetXaxis())->SetBinLabel(1,"Whole event corrupted"); @@ -904,10 +904,10 @@ StatusCode LArFEBMon::bookNewPartitionSumm(summaryPartition& summ,std::string su { ATH_MSG_DEBUG( "In bookNewPartitionSumm ->" << summName ); - MonGroup perPartitionGroup( this, "/LAr/FEBMon/perPartition", run, ATTRIB_MANAGED ); - MonGroup perPartitionYieldGroup( this, "/LAr/FEBMon/perPartition", run, ATTRIB_MANAGED, "" , "weightedEff" ); - MonGroup perPartitionDataGroup( this, "/LAr/FEBMon/perPartitionData", run, ATTRIB_MANAGED ); - MonGroup perPartitionMiscGroup( this, "/LAr/FEBMon/perPartitionMisc", run, ATTRIB_MANAGED ); + MonGroup perPartitionGroup( this, "/LAr/FEBMonOldTool/perPartition", run, ATTRIB_MANAGED ); + MonGroup perPartitionYieldGroup( this, "/LAr/FEBMonOldTool/perPartition", run, ATTRIB_MANAGED, "" , "weightedEff" ); + MonGroup perPartitionDataGroup( this, "/LAr/FEBMonOldTool/perPartitionData", run, ATTRIB_MANAGED ); + MonGroup perPartitionMiscGroup( this, "/LAr/FEBMonOldTool/perPartitionMisc", run, ATTRIB_MANAGED ); int nbOfFT = 25; int nbOfSlot = 15; @@ -1188,7 +1188,7 @@ LArFEBMon::fillFebInError(const summaryPartition& summ,int errorType,int barrel_ // TH2I* tempHisto = TH2I_LW::create(*summ.parity); - std::string hName = "/LAr/FEBMon/perPartition/FebInErrors/" + summName; + std::string hName = "/LAr/FEBMonOldTool/perPartition/FebInErrors/" + summName; MonGroup generalGroup( this, hName.c_str(), run, ATTRIB_MANAGED); diff --git a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx index 05ccf97fb31a9bd590ae6bc43a9695ff8bc0d4da..4e53e302c875eaf745059b2285bd679c7ec2a5c7 100644 --- a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx +++ b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx @@ -113,7 +113,7 @@ LArHVCorrectionMonTool::bookHistograms() // if(isNewRun){ // Create top folder for histos - MonGroup generalGroup( this, "/LAr/HVCorrection", run, ATTRIB_MANAGED, "", "weightedAverage" ); + MonGroup generalGroup( this, "/LAr/HVCorrectionOldTool", run, ATTRIB_MANAGED, "", "weightedAverage" ); // EM Calorimeter - Barrel m_hLArHVCorrectionEMB[0] = TH2F_LW::create("LArHVCorrectionEMBA", diff --git a/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx b/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx index 4a563e57e10ae32929a0c59aad4a628fa2a2f102..84f403901fa83e513ad091f6d3af541338268555 100644 --- a/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx +++ b/LArCalorimeter/LArMonTools/src/LArNoiseCorrelationMon.cxx @@ -189,14 +189,14 @@ LArNoiseCorrelationMon::bookHistograms() m_chan_low=-0.5; m_chan_up=127.5; - MonGroup GroupEMBA( this, "/LAr/NoiseCorrelation/EMBA", run, ATTRIB_MANAGED ); - MonGroup GroupEMBC( this, "/LAr/NoiseCorrelation/EMBC", run, ATTRIB_MANAGED ); - MonGroup GroupEMECA( this, "/LAr/NoiseCorrelation/EMECA", run, ATTRIB_MANAGED ); - MonGroup GroupEMECC( this, "/LAr/NoiseCorrelation/EMECC", run, ATTRIB_MANAGED ); - MonGroup GroupHECA( this, "/LAr/NoiseCorrelation/HECA", run, ATTRIB_MANAGED ); - MonGroup GroupHECC( this, "/LAr/NoiseCorrelation/HECC", run, ATTRIB_MANAGED ); - MonGroup GroupFCALA( this, "/LAr/NoiseCorrelation/FCALA", run, ATTRIB_MANAGED ); - MonGroup GroupFCALC( this, "/LAr/NoiseCorrelation/FCALC", run, ATTRIB_MANAGED ); + MonGroup GroupEMBA( this, "/LAr/NoiseCorrelationOldTool/EMBA", run, ATTRIB_MANAGED ); + MonGroup GroupEMBC( this, "/LAr/NoiseCorrelationOldTool/EMBC", run, ATTRIB_MANAGED ); + MonGroup GroupEMECA( this, "/LAr/NoiseCorrelationOldTool/EMECA", run, ATTRIB_MANAGED ); + MonGroup GroupEMECC( this, "/LAr/NoiseCorrelationOldTool/EMECC", run, ATTRIB_MANAGED ); + MonGroup GroupHECA( this, "/LAr/NoiseCorrelationOldTool/HECA", run, ATTRIB_MANAGED ); + MonGroup GroupHECC( this, "/LAr/NoiseCorrelationOldTool/HECC", run, ATTRIB_MANAGED ); + MonGroup GroupFCALA( this, "/LAr/NoiseCorrelationOldTool/FCALA", run, ATTRIB_MANAGED ); + MonGroup GroupFCALC( this, "/LAr/NoiseCorrelationOldTool/FCALC", run, ATTRIB_MANAGED ); /**declare strings for histograms title*/ m_hist_name = "NoiseCorr_"; diff --git a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx index beccdac2b127a6446f03581db2a8193bb63f3488..b0382448a9c9a02066d6d9c8c6d857b46741a099 100644 --- a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx +++ b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx @@ -101,19 +101,19 @@ StatusCode LArNoisyROMon::bookHistograms() std::string hTitle; std::stringstream tit; - MonGroup overall(this, "/LAr/NoisyRO", run, ATTRIB_MANAGED ); + MonGroup overall(this, "/LAr/NoisyROOldTool", run, ATTRIB_MANAGED ); if(m_doHisto) { // Book histograms per partitions - MonGroup GroupBarrel(this, "/LAr/NoisyRO/Barrel", run, ATTRIB_MANAGED ); - MonGroup GroupBarrelFrac(this, "/LAr/NoisyRO/Barrel", run, ATTRIB_MANAGED ,"", "weightedEff"); - MonGroup GroupBarrelFracBin(this, "/LAr/NoisyRO/Barrel", run, ATTRIB_MANAGED ,"", "perBinEffPerCent"); + MonGroup GroupBarrel(this, "/LAr/NoisyROiOldTool/Barrel", run, ATTRIB_MANAGED ); + MonGroup GroupBarrelFrac(this, "/LAr/NoisyROOldTool/Barrel", run, ATTRIB_MANAGED ,"", "weightedEff"); + MonGroup GroupBarrelFracBin(this, "/LAr/NoisyROOldTool/Barrel", run, ATTRIB_MANAGED ,"", "perBinEffPerCent"); m_partHistos.resize(4); bookPartitionHistos(m_partHistos[1],"EMBA",GroupBarrel,GroupBarrelFrac,GroupBarrelFracBin); bookPartitionHistos(m_partHistos[2],"EMBC",GroupBarrel,GroupBarrelFrac,GroupBarrelFracBin); - MonGroup GroupEMEC(this, "/LAr/NoisyRO/EMEC", run, ATTRIB_MANAGED ); - MonGroup GroupEMECFrac(this, "/LAr/NoisyRO/EMEC", run, ATTRIB_MANAGED,"", "weightedEff" ); - MonGroup GroupEMECFracBin(this, "/LAr/NoisyRO/EMEC", run, ATTRIB_MANAGED,"", "perBinEffPerCent" ); + MonGroup GroupEMEC(this, "/LAr/NoisyROOldTool/EMEC", run, ATTRIB_MANAGED ); + MonGroup GroupEMECFrac(this, "/LAr/NoisyROOldTool/EMEC", run, ATTRIB_MANAGED,"", "weightedEff" ); + MonGroup GroupEMECFracBin(this, "/LAr/NoisyROOldTool/EMEC", run, ATTRIB_MANAGED,"", "perBinEffPerCent" ); bookPartitionHistos(m_partHistos[0],"EMECA",GroupEMEC,GroupEMECFrac,GroupEMECFracBin); bookPartitionHistos(m_partHistos[3],"EMECC",GroupEMEC,GroupEMECFrac,GroupEMECFracBin); diff --git a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx index 1147d2b7e21d55cf59930f62455f9b061e3682a0..9f6d578670410ee2b3b74c603f60137e4a028834 100755 --- a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx +++ b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx @@ -268,10 +268,10 @@ LArRODMonTool::bookHistograms() strHelper.setDefaultNameType(LArOnlineIDStrHelper::LARONLINEID); // EMB A and C - MonGroup generalGroupBarrel( this, "/LAr/DSPMonitoring/EMB", run, ATTRIB_MANAGED ); - MonGroup generalGroupEndcap( this, "/LAr/DSPMonitoring/Emec", run, ATTRIB_MANAGED ); - MonGroup generalGroupHec( this, "/LAr/DSPMonitoring/Hec", run, ATTRIB_MANAGED ); - MonGroup generalGroupFcal( this, "/LAr/DSPMonitoring/Fcal", run, ATTRIB_MANAGED ); + MonGroup generalGroupBarrel( this, "/LAr/DSPMonitoringOldTool/EMB", run, ATTRIB_MANAGED ); + MonGroup generalGroupEndcap( this, "/LAr/DSPMonitoringOldTool/Emec", run, ATTRIB_MANAGED ); + MonGroup generalGroupHec( this, "/LAr/DSPMonitoringOldTool/Hec", run, ATTRIB_MANAGED ); + MonGroup generalGroupFcal( this, "/LAr/DSPMonitoringOldTool/Fcal", run, ATTRIB_MANAGED ); m_histos[EMBA].m_partName="EMBA"; m_histos[EMBA].m_monGroup=&generalGroupBarrel; @@ -399,7 +399,7 @@ LArRODMonTool::bookHistograms() }//end loop over partitions // Summary histogram - MonGroup generalGroup( this, "/LAr/DSPMonitoring/Summary", run, ATTRIB_MANAGED ); + MonGroup generalGroup( this, "/LAr/DSPMonitoringOldTool/Summary", run, ATTRIB_MANAGED ); hName = "Summary_E"; hTitle = "Summary of errors on Energy per partition and per gain"; @@ -473,7 +473,7 @@ LArRODMonTool::bookHistograms() m_hQ_all->GetXaxis()->SetTitle("Q_{offline} - Q_{online} / #sqrt{Q_{offline}}"); CHECK(generalGroup.regHist(m_hQ_all)); - MonGroup debugGroup( this, "/LAr/DSPMonitoring/DQMD", run, ATTRIB_MANAGED ); // "shift" SHOULD BE CHANGED do "debug" ? + MonGroup debugGroup( this, "/LAr/DSPMonitoringOldTool/DQMD", run, ATTRIB_MANAGED ); // "shift" SHOULD BE CHANGED do "debug" ? for (unsigned p=0;p<N_PARTITIONS;++p) { HistGroup& hg=m_histos[p]; @@ -503,7 +503,7 @@ LArRODMonTool::bookHistograms() CHECK(debugGroup.regHist(m_hE_ranges_all)); - MonGroup infosGroup( this, "/LAr/DSPMonitoring/Infos", run, ATTRIB_MANAGED ); + MonGroup infosGroup( this, "/LAr/DSPMonitoringOldTool/Infos", run, ATTRIB_MANAGED ); hName = "EErrorsPerLB"; std::string cut = "#delta ADC>"+std::to_string(m_adc_th)+" and |t_{offline}| < "+std::to_string(int(m_peakTime_cut))+"ns";