Merge pull request #2564 from deguio/fixL1T

DQM fixes -- Fix wrong folder and NaN problem
cms-sw · Feb 21, 2014 · fada3b8 · fada3b8
2 parents ab1d806 + a86caa2
commit fada3b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Validation/L1T/plugins/L1Validator.cc b/Validation/L1T/plugins/L1Validator.cc
@@ -66,7 +66,6 @@ L1Validator::L1Validator(const edm::ParameterSet& iConfig){
 
   //_fileName = iConfig.getParameter<std::string>("fileName");
 
-  _dbe->setCurrentFolder(_dirName.c_str());
   _Hists = new L1ValidatorHists(_dbe);
 }
 
@@ -173,13 +172,14 @@ void L1Validator::endJob(){
 
 // ------------ method called when starting to processes a run  ------------
 void L1Validator::beginRun(edm::Run const&, edm::EventSetup const&){
+  _dbe->setCurrentFolder(_dirName.c_str());
   _Hists->Book();
 }
 
 // ------------ method called when ending the processing of a run  ------------
 
 void L1Validator::endRun(edm::Run const&, edm::EventSetup const&){
-  _Hists->Normalize();
+  //_Hists->Normalize();
 }
 
 

diff --git a/Validation/L1T/python/L1Validator_cfi.py b/Validation/L1T/python/L1Validator_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 L1Validator = cms.EDAnalyzer('L1Validator',
-  dirName=cms.string("L1T/L1TriggerVsGen/"),
+  dirName=cms.string("L1T/L1TriggerVsGen"),
 #  fileName=cms.string("L1Validation.root") #output file name
   GenSource=cms.InputTag("genParticles"),
   L1ExtraIsoEGSource=cms.InputTag("l1extraParticles", "Isolated"),

diff --git a/Validation/L1T/src/L1ValidatorHists.cc b/Validation/L1T/src/L1ValidatorHists.cc
@@ -38,15 +38,15 @@ void L1ValidatorHists::Book(){
     dR[i] = _dbe->book1D( (Name[i]+"_dR").c_str(), (Name[i]+" dR").c_str(), 20, 0, 1);
     dPt[i] = _dbe->book1D( (Name[i]+"_dPt").c_str(), (Name[i]+" dPt").c_str(), 20, -1, 1);
 
-    N[i]->getTH1()->Sumw2();
-    N_Pt[i]->Sumw2();
-    N_Eta[i]->Sumw2();
-    Eff_Pt[i]->getTH1()->Sumw2();
-    Eff_Eta[i]->getTH1()->Sumw2();
-    TurnOn_15[i]->getTH1()->Sumw2();
-    TurnOn_30[i]->getTH1()->Sumw2();
-    dR[i]->getTH1()->Sumw2();
-    dPt[i]->getTH1()->Sumw2();
+//     N[i]->getTH1()->Sumw2();
+//     N_Pt[i]->Sumw2();
+//     N_Eta[i]->Sumw2();
+//     Eff_Pt[i]->getTH1()->Sumw2();
+//     Eff_Eta[i]->getTH1()->Sumw2();
+//     TurnOn_15[i]->getTH1()->Sumw2();
+//     TurnOn_30[i]->getTH1()->Sumw2();
+//     dR[i]->getTH1()->Sumw2();
+//     dPt[i]->getTH1()->Sumw2();
   }
 
 }