From 15dfa0ada8922cfccbbd208e7592f40cb1816d52 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 17:35:13 +0100 Subject: [PATCH 01/59] New ElectronMcSignalHistos.txt --- Validation/RecoEgamma/test/ElectronMcSignalHistos.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt b/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt index 01d7c69481c7b..784d6ca34125e 100644 --- a/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt +++ b/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt @@ -263,7 +263,16 @@ ElectronMcSignalValidator/h_ele_neutralHadronIso_barrel 1 1 0 0 ElectronMcSignalValidator/h_ele_neutralHadronIso_endcaps 1 1 1 0 ElectronMcSignalValidator/h_ele_photonIso 1 1 0 0 ElectronMcSignalValidator/h_ele_photonIso_barrel 1 1 0 0 -ElectronMcSignalValidator/h_ele_photonIso_endcaps 1 1 1 1 +ElectronMcSignalValidator/h_ele_photonIso_endcaps 1 1 1 0 +ElectronMcSignalValidator/h_ele_chargedHadronRelativeIso 1 1 0 0 +ElectronMcSignalValidator/h_ele_chargedHadronRelativeIso_barrel 1 1 0 0 +ElectronMcSignalValidator/h_ele_chargedHadronRelativeIso_endcaps 1 1 1 0 +ElectronMcSignalValidator/h_ele_neutralHadronRelativeIso 1 1 0 0 +ElectronMcSignalValidator/h_ele_neutralHadronRelativeIso_barrel 1 1 0 0 +ElectronMcSignalValidator/h_ele_neutralHadronRelativeIso_endcaps 1 1 1 0 +ElectronMcSignalValidator/h_ele_photonRelativeIso 1 1 0 0 +ElectronMcSignalValidator/h_ele_photonRelativeIso_barrel 1 1 0 0 +ElectronMcSignalValidator/h_ele_photonRelativeIso_endcaps 1 1 1 1 Conversion rejection information From 10db4be5561ae4a8950b30e0d30dc371507f2af4 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 17:36:38 +0100 Subject: [PATCH 02/59] New ElectronMcFakeHistos.txt --- Validation/RecoEgamma/test/ElectronMcFakeHistos.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/ElectronMcFakeHistos.txt b/Validation/RecoEgamma/test/ElectronMcFakeHistos.txt index acaf04d7bac03..bff050743961e 100644 --- a/Validation/RecoEgamma/test/ElectronMcFakeHistos.txt +++ b/Validation/RecoEgamma/test/ElectronMcFakeHistos.txt @@ -203,7 +203,16 @@ ElectronMcFakeValidator/h_ele_neutralHadronIso_barrel 1 1 0 0 ElectronMcFakeValidator/h_ele_neutralHadronIso_endcaps 1 1 1 0 ElectronMcFakeValidator/h_ele_photonIso 1 1 0 0 ElectronMcFakeValidator/h_ele_photonIso_barrel 1 1 0 0 -ElectronMcFakeValidator/h_ele_photonIso_endcaps 1 1 1 1 +ElectronMcFakeValidator/h_ele_photonIso_endcaps 1 1 1 0 +ElectronMcFakeValidator/h_ele_chargedHadronRelativeIso 1 1 0 0 +ElectronMcFakeValidator/h_ele_chargedHadronRelativeIso_barrel 1 1 0 0 +ElectronMcFakeValidator/h_ele_chargedHadronRelativeIso_endcaps 1 1 1 0 +ElectronMcFakeValidator/h_ele_neutralHadronRelativeIso 1 1 0 0 +ElectronMcFakeValidator/h_ele_neutralHadronRelativeIso_barrel 1 1 0 0 +ElectronMcFakeValidator/h_ele_neutralHadronRelativeIso_endcaps 1 1 1 0 +ElectronMcFakeValidator/h_ele_photonRelativeIso 1 1 0 0 +ElectronMcFakeValidator/h_ele_photonRelativeIso_barrel 1 1 0 0 +ElectronMcFakeValidator/h_ele_photonRelativeIso_endcaps 1 1 1 1 Conversion rejection information From 48b2f65d8ee669daacc6c9da57af0100ef13f966 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:03:44 +0100 Subject: [PATCH 03/59] remade gsf ElectronMcSignalValidator_cfi.py --- Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py index 4873b25803459..92e7874cda71d 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py @@ -30,8 +30,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gedGsfElectrons"), - electronCoreCollection = cms.InputTag("gedGsfElectronCores"), + electronCollection = cms.InputTag("gsfElectrons"), + electronCoreCollection = cms.InputTag("gsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), From 442be988ddccb7d19d8c7371b7e98dabeda0e2f5 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:04:02 +0100 Subject: [PATCH 04/59] remade gsf ElectronMcSignalPt1000Validator_cfi.py --- .../RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py index db1674501a287..c859feacaa478 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py @@ -35,8 +35,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gedGsfElectrons"), - electronCoreCollection = cms.InputTag("gedGsfElectronCores"), + electronCollection = cms.InputTag("gsfElectrons"), + electronCoreCollection = cms.InputTag("gsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), From 725fb86734eee509072acb738842e5f88cb4bb68 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:04:16 +0100 Subject: [PATCH 05/59] remade gsf ElectronMcFakeValidator_cfi.py --- Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py index 6fba554db0ab7..d15a652faeb2e 100644 --- a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py @@ -30,8 +30,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcFakeValidator"), matchingObjectCollection = cms.InputTag("iterativeCone5GenJets"), - electronCollection = cms.InputTag("gedGsfElectrons"), - electronCoreCollection = cms.InputTag("gedGsfElectronCores"), + electronCollection = cms.InputTag("gsfElectrons"), + electronCoreCollection = cms.InputTag("gsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), From 00a81050c4cb4ae582a58aa7e8d93d5f17167810 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:07:35 +0100 Subject: [PATCH 06/59] RelativeIso Histos --- .../RecoEgamma/plugins/ElectronMcFakeValidator.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.h b/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.h index 29cc4266a6aff..04e53a2b3c307 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.h +++ b/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.h @@ -397,6 +397,16 @@ class ElectronMcFakeValidator : public ElectronDqmAnalyzerBase MonitorElement *h1_ele_photonIso; MonitorElement *h1_ele_photonIso_barrel; MonitorElement *h1_ele_photonIso_endcaps; + // -- pflow over pT + MonitorElement *h1_ele_chargedHadronRelativeIso; + MonitorElement *h1_ele_chargedHadronRelativeIso_barrel; + MonitorElement *h1_ele_chargedHadronRelativeIso_endcaps; + MonitorElement *h1_ele_neutralHadronRelativeIso; + MonitorElement *h1_ele_neutralHadronRelativeIso_barrel; + MonitorElement *h1_ele_neutralHadronRelativeIso_endcaps; + MonitorElement *h1_ele_photonRelativeIso; + MonitorElement *h1_ele_photonRelativeIso_barrel; + MonitorElement *h1_ele_photonRelativeIso_endcaps; MonitorElement *h1_ele_tkSumPt_dr03; MonitorElement *h1_ele_tkSumPt_dr03_barrel; From 017997b935a8aff0eba6f19f48dde4ad9ff383a7 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:07:49 +0100 Subject: [PATCH 07/59] RelativeIso Histos --- .../plugins/ElectronMcFakeValidator.cc | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc b/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc index d579ce3989a40..85dfa8dafaa7c 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc +++ b/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc @@ -868,6 +868,16 @@ void ElectronMcFakeValidator::book() h1_ele_photonIso = bookH1withSumw2("photonIso","photonIso",100,0.0,20.,"photonIso","Events","ELE_LOGY E1 P"); h1_ele_photonIso_barrel = bookH1withSumw2("photonIso_barrel","photonIso for barrel",100,0.0,20.,"photonIso_barrel","Events","ELE_LOGY E1 P"); h1_ele_photonIso_endcaps = bookH1withSumw2("photonIso_endcaps","photonIso for endcaps",100,0.0,20.,"photonIso_endcaps","Events","ELE_LOGY E1 P"); + // -- pflow over pT + h1_ele_chargedHadronRelativeIso = bookH1withSumw2("chargedHadronRelativeIso","chargedHadronRelativeIso",100,0.0,2.,"chargedHadronRelativeIso","Events","ELE_LOGY E1 P"); + h1_ele_chargedHadronRelativeIso_barrel = bookH1withSumw2("chargedHadronRelativeIso_barrel","chargedHadronRelativeIso for barrel",100,0.0,2.,"chargedHadronRelativeIso_barrel","Events","ELE_LOGY E1 P"); + h1_ele_chargedHadronRelativeIso_endcaps = bookH1withSumw2("chargedHadronRelativeIso_endcaps","chargedHadronRelativeIso for endcaps",100,0.0,2.,"chargedHadronRelativeIso_endcaps","Events","ELE_LOGY E1 P"); + h1_ele_neutralHadronRelativeIso = bookH1withSumw2("neutralHadronRelativeIso","neutralHadronRelativeIso",100,0.0,2.,"neutralHadronRelativeIso","Events","ELE_LOGY E1 P"); + h1_ele_neutralHadronRelativeIso_barrel = bookH1withSumw2("neutralHadronRelativeIso_barrel","neutralHadronRelativeIso for barrel",100,0.0,2.,"neutralHadronRelativeIso_barrel","Events","ELE_LOGY E1 P"); + h1_ele_neutralHadronRelativeIso_endcaps = bookH1withSumw2("neutralHadronRelativeIso_endcaps","neutralHadronRelativeIso for endcaps",100,0.0,2.,"neutralHadronRelativeIso_endcaps","Events","ELE_LOGY E1 P"); + h1_ele_photonRelativeIso = bookH1withSumw2("photonRelativeIso","photonRelativeIso",100,0.0,2.,"photonRelativeIso","Events","ELE_LOGY E1 P"); + h1_ele_photonRelativeIso_barrel = bookH1withSumw2("photonRelativeIso_barrel","photonRelativeIso for barrel",100,0.0,2.,"photonRelativeIso_barrel","Events","ELE_LOGY E1 P"); + h1_ele_photonRelativeIso_endcaps = bookH1withSumw2("photonRelativeIso_endcaps","photonRelativeIso for endcaps",100,0.0,2.,"photonRelativeIso_endcaps","Events","ELE_LOGY E1 P"); // conversion rejection information h1_ele_convFlags = bookH1withSumw2("convFlags","conversion rejection flag",5,-2.5,2.5); @@ -1390,6 +1400,19 @@ void ElectronMcFakeValidator::analyze( const edm::Event & iEvent, const edm::Eve if (bestGsfElectron.isEB()) h1_ele_photonIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); if (bestGsfElectron.isEE()) h1_ele_photonIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); + // -- pflow over pT + h1_ele_chargedHadronRelativeIso->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt / bestGsfElectron.pt()); + if (bestGsfElectron.isEB()) h1_ele_chargedHadronRelativeIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt / bestGsfElectron.pt()); + if (bestGsfElectron.isEE()) h1_ele_chargedHadronRelativeIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt / bestGsfElectron.pt()); + + h1_ele_neutralHadronRelativeIso->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEB()) h1_ele_neutralHadronRelativeIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEE()) h1_ele_neutralHadronRelativeIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt / bestGsfElectron.pt()); + + h1_ele_photonRelativeIso->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEB()) h1_ele_photonRelativeIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEE()) h1_ele_photonRelativeIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt / bestGsfElectron.pt()); + // isolation h1_ele_tkSumPt_dr03->Fill(bestGsfElectron.dr03TkSumPt()); if (bestGsfElectron.isEB()) h1_ele_tkSumPt_dr03_barrel->Fill(bestGsfElectron.dr03TkSumPt()); From f88d1742d19c61ceeb49c1a07b3e65ef78135182 Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:07:59 +0100 Subject: [PATCH 08/59] RelativeIso Histos --- .../RecoEgamma/plugins/ElectronMcSignalValidator.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h index 5c5abeeec5087..547ee18125d03 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h +++ b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h @@ -479,6 +479,16 @@ class ElectronMcSignalValidator : public ElectronDqmAnalyzerBase MonitorElement *h1_ele_photonIso; MonitorElement *h1_ele_photonIso_barrel; MonitorElement *h1_ele_photonIso_endcaps; + // -- pflow over pT + MonitorElement *h1_ele_chargedHadronRelativeIso; + MonitorElement *h1_ele_chargedHadronRelativeIso_barrel; + MonitorElement *h1_ele_chargedHadronRelativeIso_endcaps; + MonitorElement *h1_ele_neutralHadronRelativeIso; + MonitorElement *h1_ele_neutralHadronRelativeIso_barrel; + MonitorElement *h1_ele_neutralHadronRelativeIso_endcaps; + MonitorElement *h1_ele_photonRelativeIso; + MonitorElement *h1_ele_photonRelativeIso_barrel; + MonitorElement *h1_ele_photonRelativeIso_endcaps; // isolation MonitorElement *h1_ele_tkSumPt_dr03; From bab933d7921577acb8af334f22e072a4b024d2bc Mon Sep 17 00:00:00 2001 From: archiron Date: Thu, 13 Mar 2014 18:08:02 +0100 Subject: [PATCH 09/59] RelativeIso Histos --- .../plugins/ElectronMcSignalValidator.cc | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc index 694f3eb1cb8e4..3b85dd30ad0c2 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc +++ b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc @@ -1044,6 +1044,16 @@ void ElectronMcSignalValidator::book() h1_ele_photonIso = bookH1withSumw2("photonIso","photonIso",100,0.0,20.,"photonIso","Events","ELE_LOGY E1 P"); h1_ele_photonIso_barrel = bookH1withSumw2("photonIso_barrel","photonIso for barrel",100,0.0,20.,"photonIso_barrel","Events","ELE_LOGY E1 P"); h1_ele_photonIso_endcaps = bookH1withSumw2("photonIso_endcaps","photonIso for endcaps",100,0.0,20.,"photonIso_endcaps","Events","ELE_LOGY E1 P"); + // -- pflow over pT + h1_ele_chargedHadronRelativeIso = bookH1withSumw2("chargedHadronRelativeIso","chargedHadronRelativeIso",100,0.0,2.,"chargedHadronRelativeIso","Events","ELE_LOGY E1 P"); + h1_ele_chargedHadronRelativeIso_barrel = bookH1withSumw2("chargedHadronRelativeIso_barrel","chargedHadronRelativeIso for barrel",100,0.0,2.,"chargedHadronRelativeIso_barrel","Events","ELE_LOGY E1 P"); + h1_ele_chargedHadronRelativeIso_endcaps = bookH1withSumw2("chargedHadronRelativeIso_endcaps","chargedHadronRelativeIso for endcaps",100,0.0,2.,"chargedHadronRelativeIso_endcaps","Events","ELE_LOGY E1 P"); + h1_ele_neutralHadronRelativeIso = bookH1withSumw2("neutralHadronRelativeIso","neutralHadronRelativeIso",100,0.0,2.,"neutralHadronRelativeIso","Events","ELE_LOGY E1 P"); + h1_ele_neutralHadronRelativeIso_barrel = bookH1withSumw2("neutralHadronRelativeIso_barrel","neutralHadronRelativeIso for barrel",100,0.0,2.,"neutralHadronRelativeIso_barrel","Events","ELE_LOGY E1 P"); + h1_ele_neutralHadronRelativeIso_endcaps = bookH1withSumw2("neutralHadronRelativeIso_endcaps","neutralHadronRelativeIso for endcaps",100,0.0,2.,"neutralHadronRelativeIso_endcaps","Events","ELE_LOGY E1 P"); + h1_ele_photonRelativeIso = bookH1withSumw2("photonRelativeIso","photonRelativeIso",100,0.0,2.,"photonRelativeIso","Events","ELE_LOGY E1 P"); + h1_ele_photonRelativeIso_barrel = bookH1withSumw2("photonRelativeIso_barrel","photonRelativeIso for barrel",100,0.0,2.,"photonRelativeIso_barrel","Events","ELE_LOGY E1 P"); + h1_ele_photonRelativeIso_endcaps = bookH1withSumw2("photonRelativeIso_endcaps","photonRelativeIso for endcaps",100,0.0,2.,"photonRelativeIso_endcaps","Events","ELE_LOGY E1 P"); // conversion rejection information h1_ele_convFlags = bookH1withSumw2("convFlags","conversion rejection flag",5,-1.5,3.5); @@ -1765,6 +1775,19 @@ void ElectronMcSignalValidator::analyze( const edm::Event & iEvent, const edm::E if (bestGsfElectron.isEB()) h1_ele_photonIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); if (bestGsfElectron.isEE()) h1_ele_photonIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); + // -- pflow over pT + h1_ele_chargedHadronRelativeIso->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt / bestGsfElectron.pt()); + if (bestGsfElectron.isEB()) h1_ele_chargedHadronRelativeIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt / bestGsfElectron.pt()); + if (bestGsfElectron.isEE()) h1_ele_chargedHadronRelativeIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt / bestGsfElectron.pt()); + + h1_ele_neutralHadronRelativeIso->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEB()) h1_ele_neutralHadronRelativeIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEE()) h1_ele_neutralHadronRelativeIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt / bestGsfElectron.pt()); + + h1_ele_photonRelativeIso->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEB()) h1_ele_photonRelativeIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt / bestGsfElectron.pt()); + if (bestGsfElectron.isEE()) h1_ele_photonRelativeIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt / bestGsfElectron.pt()); + // isolation h1_ele_tkSumPt_dr03->Fill(bestGsfElectron.dr03TkSumPt()); if (bestGsfElectron.isEB()) h1_ele_tkSumPt_dr03_barrel->Fill(bestGsfElectron.dr03TkSumPt()); From 955288426c5660b63643b064bce8aa6481ce6c14 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:46:01 +0100 Subject: [PATCH 10/59] analyze fast script --- Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh new file mode 100755 index 0000000000000..f5ddb2659dcee --- /dev/null +++ b/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh @@ -0,0 +1,4 @@ +#!/bin/tcsh +#oval run analyze.ValFastTTbarStartup_gedGsfE +./electronBsub 8nh oval run analyze.ValFastZEEStartup_gedGsfE + From 45cd6e020c96a986ff17108743c1cfd67ffb3e98 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:47:35 +0100 Subject: [PATCH 11/59] analyze full pu script --- Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh new file mode 100755 index 0000000000000..5ccf649ea9488 --- /dev/null +++ b/Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh @@ -0,0 +1,4 @@ +#!/bin/tcsh +./electronBsub 1nh oval run analyze.ValPileUpTTbarStartup_gedGsfE +./electronBsub 1nh oval run analyze.ValPileUpZEEStartup_gedGsfE + From d8fdd7290764cd1885dc3f1997bc721b6d48b2c4 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:48:48 +0100 Subject: [PATCH 12/59] analyze full script --- Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh diff --git a/Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh b/Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh new file mode 100755 index 0000000000000..9e0638326ec5a --- /dev/null +++ b/Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh @@ -0,0 +1,8 @@ +#!/bin/tcsh +./electronBsub 8nh oval run analyze.ValFullPt10Startup_UP15_gedGsfE +./electronBsub 8nh oval run analyze.ValFullPt1000Startup_UP15_gedGsfE +./electronBsub 8nh oval run analyze.ValFullPt35Startup_UP15_gedGsfE +./electronBsub 8nh oval run analyze.ValFullTTbarStartup_13_gedGsfE +./electronBsub 8nh oval run analyze.ValFullZEEStartup_13_gedGsfE +./electronBsub 8nh oval run analyze.ValFullQcdPt80Pt120Startup_13_gedGsfE + From d75585d946be7f993be066a21fb953d2e212b1f7 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:52:33 +0100 Subject: [PATCH 13/59] finalize fast script --- Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh new file mode 100755 index 0000000000000..c68a2618afc01 --- /dev/null +++ b/Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh @@ -0,0 +1,3 @@ +#!/bin/tcsh +./electronBsub 8nh oval run finalize.ValFastTTbarStartup_gedGsfE +./electronBsub 8nh oval run finalize.ValFastZEEStartup_gedGsfE From 9cec88d906e5bfdc4021c108be0eb8b0d1cbb7b4 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:53:24 +0100 Subject: [PATCH 14/59] finalize full pu script --- Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh new file mode 100755 index 0000000000000..f9c94952c8066 --- /dev/null +++ b/Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh @@ -0,0 +1,3 @@ +#!/bin/tcsh +./electronBsub 1nh oval run finalize.ValPileUpTTbarStartup_gedGsfE +./electronBsub 1nh oval run finalize.ValPileUpZEEStartup_gedGsfE From 3264173254a08c2a57fd4c9ea1cd9b5713ced070 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:53:49 +0100 Subject: [PATCH 15/59] finalize full script --- Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh diff --git a/Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh b/Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh new file mode 100755 index 0000000000000..aff0a0e609e4b --- /dev/null +++ b/Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh @@ -0,0 +1,7 @@ +#!/bin/tcsh +./electronBsub 8nh oval run finalize.ValFullPt10Startup_UP15_gedGsfE +./electronBsub 8nh oval run finalize.ValFullPt1000Startup_UP15_gedGsfE +./electronBsub 8nh oval run finalize.ValFullPt35Startup_UP15_gedGsfE +./electronBsub 8nh oval run finalize.ValFullTTbarStartup_13_gedGsfE +./electronBsub 8nh oval run finalize.ValFullZEEStartup_13_gedGsfE +./electronBsub 8nh oval run finalize.ValFullQcdPt80Pt120Startup_13_gedGsfE From 4f5dda3217ce3f61074f828dc9afaf273692a11f Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:56:47 +0100 Subject: [PATCH 16/59] store fast script --- Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh new file mode 100755 index 0000000000000..b1728a2f8688f --- /dev/null +++ b/Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh @@ -0,0 +1,3 @@ +#!/bin/tcsh +oval run store.ValFastTTbarStartup_gedGsfE +oval run store.ValFastZEEStartup_gedGsfE From ac0d667d3a47ea212a9089d862bb87af80276fde Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:57:45 +0100 Subject: [PATCH 17/59] store full pu script --- Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh new file mode 100755 index 0000000000000..ecbe62214718b --- /dev/null +++ b/Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh @@ -0,0 +1,3 @@ +#!/bin/tcsh +./electronBsub 1nh oval run store.ValPileUpTTbarStartup_gedGsfE +./electronBsub 1nh oval run store.ValPileUpZEEStartup_gedGsfE From 1c43c0f2935fb86103f44a87bb88256f97f974b9 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 10:58:20 +0100 Subject: [PATCH 18/59] store full script --- Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh diff --git a/Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh b/Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh new file mode 100755 index 0000000000000..bbbaf287a06c4 --- /dev/null +++ b/Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh @@ -0,0 +1,7 @@ +#!/bin/tcsh +oval run store.ValFullPt10Startup_UP15_gedGsfE +oval run store.ValFullPt1000Startup_UP15_gedGsfE +oval run store.ValFullPt35Startup_UP15_gedGsfE +oval run store.ValFullTTbarStartup_13_gedGsfE +oval run store.ValFullZEEStartup_13_gedGsfE +oval run store.ValFullQcdPt80Pt120Startup_13_gedGsfE From 055e557b99cc97ee833132ef05636c1d3699bac2 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 11:00:21 +0100 Subject: [PATCH 19/59] publish fast script --- Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh new file mode 100755 index 0000000000000..2d19017f38786 --- /dev/null +++ b/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh @@ -0,0 +1,5 @@ +#!/bin/tcsh +oval run publish.ValFastVsFullTTbarStartup_gedGsfE +oval run publish.ValFastVsFullZEEStartup_gedGsfE +#oval run publish.ValFastVsFastTTbarStartup_gedGsfE +#oval run publish.ValFastVsFastZEEStartup_gedGsfE From 1e55e9929c61efbcd08f67e2d140cb74a628f51d Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 11:00:56 +0100 Subject: [PATCH 20/59] publish full pu script --- Validation/RecoEgamma/test/publish_full_gedGsfE.pu.tcsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 Validation/RecoEgamma/test/publish_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/publish_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/publish_full_gedGsfE.pu.tcsh new file mode 100755 index 0000000000000..3103f89741b35 --- /dev/null +++ b/Validation/RecoEgamma/test/publish_full_gedGsfE.pu.tcsh @@ -0,0 +1,3 @@ +#!/bin/tcsh +oval run publish.ValPileUpTTbarStartup_gedGsfE +oval run publish.ValPileUpZEEStartup_gedGsfE From d422f97d55cb236355a2b00eb1130b2edd9714f3 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 11:01:50 +0100 Subject: [PATCH 21/59] publish full script --- Validation/RecoEgamma/test/publish_fullgedvsged.su.tcsh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 Validation/RecoEgamma/test/publish_fullgedvsged.su.tcsh diff --git a/Validation/RecoEgamma/test/publish_fullgedvsged.su.tcsh b/Validation/RecoEgamma/test/publish_fullgedvsged.su.tcsh new file mode 100755 index 0000000000000..5229395a7d8b8 --- /dev/null +++ b/Validation/RecoEgamma/test/publish_fullgedvsged.su.tcsh @@ -0,0 +1,7 @@ +#!/bin/tcsh +oval run publish.ValgedvsgedFullPt10Startup_UP15_gedGsfE +oval run publish.ValgedvsgedFullPt1000Startup_UP15_gedGsfE +oval run publish.ValgedvsgedFullPt35Startup_UP15_gedGsfE +oval run publish.ValgedvsgedFullTTbarStartup_13_gedGsfE +oval run publish.ValgedvsgedFullZEEStartup_13_gedGsfE +oval run publish.ValgedvsgedFullQcdPt80Pt120Startup_13_gedGsfE From 5eff5ff76e23fdb020598259d8b6596ba25903cc Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 11:10:20 +0100 Subject: [PATCH 22/59] OvalFile FAST --- Validation/RecoEgamma/test/OvalFile.FAST | 246 +++++++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 Validation/RecoEgamma/test/OvalFile.FAST diff --git a/Validation/RecoEgamma/test/OvalFile.FAST b/Validation/RecoEgamma/test/OvalFile.FAST new file mode 100644 index 0000000000000..a4d82cefbb749 --- /dev/null +++ b/Validation/RecoEgamma/test/OvalFile.FAST @@ -0,0 +1,246 @@ + + + + + + + +TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE + + + + + + + + + + + + +The value of OVAL_ENVNAME is automatically set by Oval to the name +of the current environment, before running any executable. Using it below, +we have an output file name which is unique for each execution. + + + + + + + +The DD_* variables are configuration variables for the script electronDataDiscovery.py, +which prepares and send a query to the Data Discovery web server, +and receive as a result the corresponding list of input data files. + + +The tags below are to be used when DAS seems not up-to-date, +as compared to what you see within castor directories. +These parameters have been added to each RelVal sample environment + + + + +The tags below are to be used when you want to process some files +made with a modified code, and generated locally, thanks to the +targets RedoFrom% defined later on. + + + +Oval is able to check the output channel of an execution and compare it with a reference output. +The tags below are defining which are lines to be compared. The currently specification is a +first draft, and we do not yet check the differences that Oval could raise. + + + + + + + + + + + + +The file defined below is used by the script electronDataDiscovery.py when we want to analyze +some RelVal reco files which have been regenerated locally. + + + + +file:${TEST_AFS_DIR}/RelValSingleElectronPt10-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValSingleElectronPt35-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValTTbar-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValZEE-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValQCD_Pt_80_120-STARTUP-RECO.root + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +FastSim +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 21282e2b336731bd04f92362fc5322cf042880ab Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 11:10:30 +0100 Subject: [PATCH 23/59] OvalFile PU --- Validation/RecoEgamma/test/OvalFile.PU | 205 +++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 Validation/RecoEgamma/test/OvalFile.PU diff --git a/Validation/RecoEgamma/test/OvalFile.PU b/Validation/RecoEgamma/test/OvalFile.PU new file mode 100644 index 0000000000000..086e84f09576d --- /dev/null +++ b/Validation/RecoEgamma/test/OvalFile.PU @@ -0,0 +1,205 @@ + + + + + + + +TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE + + + + + + + + + + + + +The value of OVAL_ENVNAME is automatically set by Oval to the name +of the current environment, before running any executable. Using it below, +we have an output file name which is unique for each execution. + + + + + + +The DD_* variables are configuration variables for the script electronDataDiscovery.py, +which prepares and send a query to the Data Discovery web server, +and receive as a result the corresponding list of input data files. + + +The tags below are to be used when DAS seems not up-to-date, +as compared to what you see within castor directories. +These parameters have been added to each RelVal sample environment + + + + +The tags below are to be used when you want to process some files +made with a modified code, and generated locally, thanks to the +targets RedoFrom% defined later on. + + + +Oval is able to check the output channel of an execution and compare it with a reference output. +The tags below are defining which are lines to be compared. The currently specification is a +first draft, and we do not yet check the differences that Oval could raise. + + + + + + + + + + + + +The file defined below is used by the script electronDataDiscovery.py when we want to analyze +some RelVal reco files which have been regenerated locally. + + + + +file:${TEST_AFS_DIR}/RelValSingleElectronPt10-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValSingleElectronPt35-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValTTbar-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValZEE-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValQCD_Pt_80_120-STARTUP-RECO.root + + +Here comes the concrete executables to run. They are split among few different +environments, each one defining the relevant variales for a given scenario and/or +data sample. Running electronDataDiscovery.py is only usefull to check the correctness +of the list of input data files returned by the data discovery web server. We guess +that from time to time we will have to upgrade the values DD_* variable so to keep in +touch with changes in data catalog structure. + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +FullSim +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + This set of targets is currently used for the validation of electrons. + + Used if DD_SOURCE=das + + + Used if DD_source=/eos/... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e2257a5d043bcab61339b088602bf7fec02886a3 Mon Sep 17 00:00:00 2001 From: archiron Date: Fri, 14 Mar 2014 11:10:37 +0100 Subject: [PATCH 24/59] OvalFile GED --- Validation/RecoEgamma/test/OvalFile.GED | 1036 +++++++++++++++++++++++ 1 file changed, 1036 insertions(+) create mode 100644 Validation/RecoEgamma/test/OvalFile.GED diff --git a/Validation/RecoEgamma/test/OvalFile.GED b/Validation/RecoEgamma/test/OvalFile.GED new file mode 100644 index 0000000000000..17a2c76f8d8d3 --- /dev/null +++ b/Validation/RecoEgamma/test/OvalFile.GED @@ -0,0 +1,1036 @@ + + + + + + + +TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE + + + + + + + + + + + + +The value of OVAL_ENVNAME is automatically set by Oval to the name +of the current environment, before running any executable. Using it below, +we have an output file name which is unique for each execution. + + + + + + +The DD_* variables are configuration variables for the script electronDataDiscovery.py, +which prepares and send a query to the Data Discovery web server, +and receive as a result the corresponding list of input data files. + + +The tags below are to be used when DAS seems not up-to-date, +as compared to what you see within castor directories. +These parameters have been added to each RelVal sample environment + + + + +The tags below are to be used when you want to process some files +made with a modified code, and generated locally, thanks to the +targets RedoFrom% defined later on. + + + +Oval is able to check the output channel of an execution and compare it with a reference output. +The tags below are defining which are lines to be compared. The currently specification is a +first draft, and we do not yet check the differences that Oval could raise. + + + + + + + + + + + + +The file defined below is used by the script electronDataDiscovery.py when we want to analyze +some RelVal reco files which have been regenerated locally. + + + + +file:${TEST_AFS_DIR}/RelValSingleElectronPt10-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValSingleElectronPt35-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValTTbar-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValZEE-STARTUP-RECO.root +file:${TEST_AFS_DIR}/RelValQCD_Pt_80_120-STARTUP-RECO.root + + +Here comes the concrete executables to run. They are split among few different +environments, each one defining the relevant variales for a given scenario and/or +data sample. Running electronDataDiscovery.py is only usefull to check the correctness +of the list of input data files returned by the data discovery web server. We guess +that from time to time we will have to upgrade the values DD_* variable so to keep in +touch with changes in data catalog structure. + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +FullSim +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + This set of targets is currently used for the validation of electrons. + + Used if DD_SOURCE=das + + + Used if DD_source=/eos/... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +FastSim +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +This set of targets is made to redo the electrons +with the local modified code. +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + + + + + + + + + + + + + + + + + + + + + + file:${TEST_AFS_DIR}/RelValSingleElectronPt10-STARTUP-FIRST-RECO.root + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${TEST_AFS_DIR}/RelValSingleElectronPt10-IDEAL-RAW.root + ${TEST_AFS_DIR}/RelValSingleElectronPt35-IDEAL-RAW.root + ${TEST_AFS_DIR}/RelValTTbar-IDEAL-RAW.root + ${TEST_AFS_DIR}/RelValZEE-IDEAL-RAW.root + ${TEST_AFS_DIR}/RelValZEE-STARTUP-RAW.root + ${TEST_AFS_DIR}/RelValQCD_Pt_80_120-IDEAL-RAW.root + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +This set of targets is made to test cmsDriver.py steps +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +Process uncleaned superclusters +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + + + + + + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +================================================================================ +Photons +================================================================================ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + Those few photons datasets are checked so to compare + size and performance with electrons. + + + + + + + + + + + + + + + + + + From bde60e5cff8f9c062d0d41a2e27f58e913f69701 Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 21 Mar 2014 16:01:18 +0100 Subject: [PATCH 25/59] Update analyze_fast_gedGsfE.tcsh --- Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh index f5ddb2659dcee..b2ea7454258f0 100755 --- a/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh @@ -1,4 +1,4 @@ #!/bin/tcsh -#oval run analyze.ValFastTTbarStartup_gedGsfE +./electronBsub 8nh oval run analyze.ValFastTTbarStartup_gedGsfE ./electronBsub 8nh oval run analyze.ValFastZEEStartup_gedGsfE From 7710ed5a61d826902dd10b2feca8eab6156347b5 Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 21 Mar 2014 16:02:34 +0100 Subject: [PATCH 26/59] Update publish_fast_gedGsfE.tcsh --- Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh index 2d19017f38786..b5625402d576c 100755 --- a/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/publish_fast_gedGsfE.tcsh @@ -1,5 +1,5 @@ #!/bin/tcsh oval run publish.ValFastVsFullTTbarStartup_gedGsfE oval run publish.ValFastVsFullZEEStartup_gedGsfE -#oval run publish.ValFastVsFastTTbarStartup_gedGsfE -#oval run publish.ValFastVsFastZEEStartup_gedGsfE +oval run publish.ValFastVsFastTTbarStartup_gedGsfE +oval run publish.ValFastVsFastZEEStartup_gedGsfE From 281a35768bf2b4391c8c0846226ae5037275deb1 Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 28 Mar 2014 11:37:28 +0100 Subject: [PATCH 27/59] Update ElectronMcSignalValidator_cfi.py --- .../RecoEgamma/python/ElectronMcSignalValidator_cfi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py index 92e7874cda71d..1e843e9cc231f 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py @@ -1,4 +1,3 @@ - import FWCore.ParameterSet.Config as cms electronMcSignalHistosCfg = cms.PSet( @@ -30,8 +29,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), From ed553a41b8ee28aaaa320a7b1c0792a00d298204 Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 28 Mar 2014 11:37:53 +0100 Subject: [PATCH 28/59] Update ElectronMcSignalPt1000Validator_cfi.py --- .../RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py index c859feacaa478..32b691cff68f2 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py @@ -1,4 +1,3 @@ - import FWCore.ParameterSet.Config as cms electronMcSignalHistosCfg = cms.PSet( @@ -35,8 +34,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), From 608a4eb7cb0477f14c21b808a7c3ecc780982f2f Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 28 Mar 2014 11:38:17 +0100 Subject: [PATCH 29/59] Update ElectronMcFakeValidator_cfi.py --- Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py index d15a652faeb2e..52a4c9b54bfd6 100644 --- a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py @@ -1,4 +1,3 @@ - import FWCore.ParameterSet.Config as cms electronMcFakeHistosCfg = cms.PSet( @@ -30,8 +29,8 @@ OutputFolderName = cms.string("EgammaV/ElectronMcFakeValidator"), matchingObjectCollection = cms.InputTag("iterativeCone5GenJets"), - electronCollection = cms.InputTag("gsfElectrons"), - electronCoreCollection = cms.InputTag("gsfElectronCores"), + electronCollection = cms.InputTag("gedGsfElectrons"), + electronCoreCollection = cms.InputTag("gedGsfElectronCores"), electronTrackCollection = cms.InputTag("electronGsfTracks"), electronSeedCollection = cms.InputTag("electronMergedSeeds"), From 492f446d5629d1152c833b328c1f592694ad3155 Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 28 Mar 2014 14:45:05 +0100 Subject: [PATCH 30/59] Update README --- Validation/RecoEgamma/test/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/README b/Validation/RecoEgamma/test/README index fb735b90030cd..0bbf7c32c423b 100644 --- a/Validation/RecoEgamma/test/README +++ b/Validation/RecoEgamma/test/README @@ -54,7 +54,7 @@ RelValTTbar GEN-SIM-DIGI-RECO PRE_..._FastSim-.. RelValZEE -Targets for analyze, finalize ans store steps: +Targets for analyze, finalize ans store steps : ValFastTTbarStartup ValFastZEEStartup From aa6b9a720b3361e401582bf703eaa6e9b18ff76b Mon Sep 17 00:00:00 2001 From: Chiron Date: Fri, 28 Mar 2014 15:25:05 +0100 Subject: [PATCH 31/59] Update OvalFile.PU --- Validation/RecoEgamma/test/OvalFile.PU | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/OvalFile.PU b/Validation/RecoEgamma/test/OvalFile.PU index 086e84f09576d..2179f25420c87 100644 --- a/Validation/RecoEgamma/test/OvalFile.PU +++ b/Validation/RecoEgamma/test/OvalFile.PU @@ -83,7 +83,7 @@ touch with changes in data catalog structure. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ================================================================================ -FullSim +FullSim ================================================================================ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% From 99af1dfca8303ff6f3685a568cfb97de1317e87f Mon Sep 17 00:00:00 2001 From: Nancy Date: Tue, 1 Apr 2014 17:52:29 +0200 Subject: [PATCH 32/59] Add to PhotonAnalyzer and ZToMuMuGammaAnalyzer the histogram with Nvtx and the sigmaE/E vs Nvtx --- DQMOffline/EGamma/plugins/PhotonAnalyzer.cc | 16 ++++++++++++++-- DQMOffline/EGamma/plugins/PhotonAnalyzer.h | 6 +++++- .../EGamma/plugins/ZToMuMuGammaAnalyzer.cc | 16 ++++++++++++++-- DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h | 5 ++++- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc index 82d839c7b5568..127c3ffbd09f9 100755 --- a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc +++ b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc @@ -37,6 +37,9 @@ PhotonAnalyzer::PhotonAnalyzer( const edm::ParameterSet& pset ) triggerEvent_token_ = consumes(pset.getParameter("triggerEvent")); + offline_pvToken_ = consumes(pset.getUntrackedParameter("offlinePV", edm::InputTag("offlinePrimaryVertices"))); + + minPhoEtCut_ = pset.getParameter("minPhoEtCut"); photonMaxEta_ = pset.getParameter("maxPhoEta"); invMassEtCut_ = pset.getParameter("invMassEtCut"); @@ -240,14 +243,17 @@ void PhotonAnalyzer::beginJob() h_invMassZeroWithTracks_= bookHisto("invMassZeroWithTracks", "Two photon invariant mass: Neither has tracks;M (GeV)", etBin,etMin,etMax); h_invMassOneWithTracks_ = bookHisto("invMassOneWithTracks", "Two photon invariant mass: Only one has tracks;M (GeV)", etBin,etMin,etMax); h_invMassTwoWithTracks_ = bookHisto("invMassTwoWithTracks", "Two photon invariant mass: Both have tracks;M (GeV)", etBin,etMin,etMax); - + + + h_nRecoVtx_ = bookHisto("nOfflineVtx","# of Offline Vertices",80, -0.5, 79.5); ////////////////START OF BOOKING FOR PHOTON-RELATED HISTOGRAMS//////////////// //ENERGY VARIABLES book3DHistoVector(h_phoE_, "1D","phoE","Energy;E (GeV)",eBin,eMin,eMax); - book3DHistoVector(h_phoSigmaEoverE_, "1D","phoSigmaEoverE","#sigma_{E}/E; #sigma_{E}/E", 100,0.,0.06); + book3DHistoVector(h_phoSigmaEoverE_, "1D","phoSigmaEoverE","#sigma_{E}/E; #sigma_{E}/E", 100,0.,0.08); + book3DHistoVector(p_phoSigmaEoverEvsNVtx_, "Profile","phoSigmaEoverEvsNVtx","#sigma_{E}/E vs NVtx; N_{vtx}; #sigma_{E}/E",80, -0.5, 79.5, 100,0., 0.08); book3DHistoVector(h_phoEt_, "1D","phoEt","E_{T};E_{T} (GeV)", etBin,etMin,etMax); @@ -494,6 +500,9 @@ void PhotonAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& esup ) if (validtightPhotonID) tightPhotonID = *(tightPhotonFlag.product()); + edm::Handle vtxH; + e.getByToken(offline_pvToken_, vtxH); + h_nRecoVtx_ ->Fill (float(vtxH->size())); // Create array to hold #photons/event information int nPho[100][3][3]; @@ -760,6 +769,9 @@ void PhotonAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& esup ) fill3DHistoVector(h_phoE_, aPho->energy(),cut,type,part); fill3DHistoVector(h_phoSigmaEoverE_, aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy(),cut,type,part); + + fill3DHistoVector(p_phoSigmaEoverEvsNVtx_, float(vtxH->size()), aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy(),cut,type,part); + fill3DHistoVector(h_phoEt_,aPho->et(), cut,type,part); //geometrical variables diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h index a121f7a7c0dd8..0e30af80b630f 100755 --- a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h +++ b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h @@ -19,7 +19,7 @@ #include "DataFormats/EgammaCandidates/interface/ConversionFwd.h" #include "DataFormats/EgammaCandidates/interface/Photon.h" #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h" - +#include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/EgammaReco/interface/BasicCluster.h" #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h" #include "DataFormats/CaloRecHit/interface/CaloCluster.h" @@ -162,6 +162,8 @@ class PhotonAnalyzer : public edm::EDAnalyzer edm::EDGetTokenT > > endcapRecHit_token_; edm::EDGetTokenT triggerEvent_token_; + + edm::EDGetTokenT offline_pvToken_; double minPhoEtCut_; double photonMaxEta_; @@ -208,6 +210,7 @@ class PhotonAnalyzer : public edm::EDAnalyzer MonitorElement* totalNumberOfHistos_photonsFolder; MonitorElement* totalNumberOfHistos_conversionsFolder; + MonitorElement* h_nRecoVtx_; MonitorElement* h_phoEta_Loose_; MonitorElement* h_phoEta_Tight_; @@ -367,6 +370,7 @@ class PhotonAnalyzer : public edm::EDAnalyzer std::vector > > h_phoE_; std::vector > > h_phoSigmaEoverE_; + std::vector > > p_phoSigmaEoverEvsNVtx_; std::vector > > h_phoEt_; std::vector > > h_r9_; std::vector > > h_phoPhi_; diff --git a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc index a260a1325adbd..6179216d19c83 100755 --- a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc +++ b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc @@ -32,6 +32,8 @@ ZToMuMuGammaAnalyzer::ZToMuMuGammaAnalyzer( const edm::ParameterSet& pset ) // triggerEvent_ = pset.getParameter("triggerEvent"); triggerEvent_token_ = consumes(pset.getParameter("triggerEvent")); + + offline_pvToken_ = consumes(pset.getUntrackedParameter("offlinePV", edm::InputTag("offlinePrimaryVertices"))); useTriggerFiltering_ = pset.getParameter("useTriggerFiltering"); splitHistosEBEE_ = pset.getParameter("splitHistosEBEE"); @@ -179,7 +181,7 @@ void ZToMuMuGammaAnalyzer::beginJob() ////////////////START OF BOOKING FOR PHOTON-RELATED HISTOGRAMS//////////////// //// 1D Histograms //// - + h_nRecoVtx_ = dbe_->book1D("nOfflineVtx","# of Offline Vertices",80, -0.5, 79.5); //ENERGY h_phoE_[0] = dbe_->book1D("phoE","Energy;E (GeV)",eBin,eMin,eMax); @@ -447,7 +449,11 @@ void ZToMuMuGammaAnalyzer::beginJob() p_hOverEVsEt_[1] = dbe_->bookProfile("p_hOverEVsEtBarrel","Avg H/E vs Et;E_{T} (GeV);H/E",etBin,etMin,etMax,hOverEBin,hOverEMin,hOverEMax); p_hOverEVsEt_[2] = dbe_->bookProfile("p_hOverEVsEtEndcap","Avg H/E vs Et;E_{T} (GeV);H/E",etBin,etMin,etMax,hOverEBin,hOverEMin,hOverEMax); p_hOverEVsEta_[0] = dbe_->bookProfile("p_hOverEVsEta","Avg H/E vs #eta;#eta;H/E",etaBin,etaMin,etaMax,hOverEBin,hOverEMin,hOverEMax); - + // sigmaE/E + histname = "sigmaEoverEVsNVtx"; + p_phoSigmaEoverEVsNVtx_[1] = dbe_->bookProfile(histname+"Barrel","Photons #sigma_{E}/E vs N_{vtx}: Barrel; N_{vtx}; #sigma_{E}/E ",80, -0.5, 79.5, 100,0., 0.08, ""); + p_phoSigmaEoverEVsNVtx_[2] = dbe_->bookProfile(histname+"Endcap","Photons #sigma_{E}/E vs N_{vtx}: Endcap; N_{vtx}; #sigma_{E}/E",80, -0.5, 79.5, 100,0., 0.08, ""); + } @@ -611,6 +617,11 @@ void ZToMuMuGammaAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& else ++i ; } + edm::Handle vtxH; + e.getByToken(offline_pvToken_, vtxH); + h_nRecoVtx_ ->Fill (float(vtxH->size())); + + //photon counters int nPho = 0; int nPhoBarrel = 0; @@ -686,6 +697,7 @@ void ZToMuMuGammaAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& h_phoEt_[0] ->Fill (aPho->et()); h_phoE_[iDet] ->Fill (aPho->energy()); h_phoSigmaEoverE_[iDet] ->Fill( aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy() ); + p_phoSigmaEoverEVsNVtx_[iDet] ->Fill( float(vtxH->size()), aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy() ); h_phoEt_[iDet] ->Fill (aPho->et()); //GEOMETRICAL h_phoEta_[0] ->Fill (aPho->eta()); diff --git a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h index 135a9591cb04a..c63875958887a 100755 --- a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h +++ b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h @@ -21,7 +21,7 @@ #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" #include "DataFormats/MuonReco/interface/MuonSelectors.h" - +#include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/EgammaReco/interface/BasicCluster.h" #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h" #include "DataFormats/CaloRecHit/interface/CaloCluster.h" @@ -130,6 +130,7 @@ class ZToMuMuGammaAnalyzer : public edm::EDAnalyzer edm::EDGetTokenT triggerEvent_token_; edm::EDGetTokenT beamSpot_token_; edm::EDGetTokenT pfCandidates_; + edm::EDGetTokenT offline_pvToken_; std::string valueMapPhoPFCandIso_ ; @@ -185,12 +186,14 @@ class ZToMuMuGammaAnalyzer : public edm::EDAnalyzer bool photonSelection ( const reco::PhotonRef & p ); + MonitorElement* h_nRecoVtx_; ///photon histos MonitorElement* h1_mumuInvMass_[3]; MonitorElement* h1_mumuGammaInvMass_[3]; MonitorElement* h_phoE_[3]; MonitorElement* h_phoSigmaEoverE_[3]; + MonitorElement* p_phoSigmaEoverEVsNVtx_[3]; MonitorElement* h_phoEt_[3]; MonitorElement* h_nPho_[3]; From 0d6530948d9c89e034dd4d772bea44839f4e3967 Mon Sep 17 00:00:00 2001 From: Andrea Venturi Date: Thu, 3 Apr 2014 21:02:23 +0200 Subject: [PATCH 33/59] Added warning message of number of events is not enough --- .../plugins/SiStripQualityHotStripIdentifierRoot.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc index 78e4330819b1c..c100742a21c12 100644 --- a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc +++ b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc @@ -180,7 +180,7 @@ SiStripBadStrip* SiStripQualityHotStripIdentifierRoot::getNewObject(){ } else { - edm::LogInfo("SiStripQualityHotStripIdentifierRoot") <<" [SiStripQualityHotStripIdentifierRoot::getNewObject] Total number of events is " << TotNumberOfEvents << ", wich is below the threshold (" << calibrationthreshold << "). Calibration will NOT be launched." <(new TH1F(*(*iter)->getTH1F())); } + if(!gotNentries) edm::LogWarning("MissingNumberOfEvents") <<"Missing histogram to get the number of events"; } From f76c6fcf8b7d285daa0fd505e2264cb0849c2657 Mon Sep 17 00:00:00 2001 From: Elvire Bouvier Date: Fri, 4 Apr 2014 10:33:43 +0200 Subject: [PATCH 34/59] fix top dqm regarding the way to get hlt process name (Andrea Perrotta) --- .../interface/TopDiLeptonHLTOfflineDQM.h | 1 + .../interface/TopSingleLeptonHLTOfflineDQM.h | 1 + .../Trigger/src/TopDiLeptonHLTOfflineDQM.cc | 40 +++++++++---------- .../src/TopSingleLeptonHLTOfflineDQM.cc | 24 +++++------ 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h b/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h index cd5a2c416aa40..d9b7a5064a42c 100644 --- a/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h +++ b/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h @@ -149,6 +149,7 @@ namespace HLTOfflineDQMTopDiLepton { std::map hists_; /// hlt objects + std::string processName_; trigger::Vids electronIds_; trigger::VRelectron electronRefs_; trigger::Vids muonIds_; diff --git a/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h b/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h index 28ca2749fd255..92e3b0d38880b 100644 --- a/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h +++ b/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h @@ -151,6 +151,7 @@ namespace HLTOfflineDQMTopSingleLepton { std::map hists_; /// hlt objects + std::string processName_; trigger::Vids electronIds_; trigger::VRelectron electronRefs_; trigger::Vids muonIds_; diff --git a/DQMOffline/Trigger/src/TopDiLeptonHLTOfflineDQM.cc b/DQMOffline/Trigger/src/TopDiLeptonHLTOfflineDQM.cc index e818d6f3cdd7b..9f1b6091f794d 100644 --- a/DQMOffline/Trigger/src/TopDiLeptonHLTOfflineDQM.cc +++ b/DQMOffline/Trigger/src/TopDiLeptonHLTOfflineDQM.cc @@ -97,12 +97,14 @@ namespace HLTOfflineDQMTopDiLepton { } } // triggerExtras are optional; they may be omitted or empty + processName_ = "HLT"; if( cfg.existsAs("triggerExtras") ){ edm::ParameterSet triggerExtras=cfg.getParameter("triggerExtras"); triggerTable_= iC.consumes< edm::TriggerResults >(triggerExtras.getParameter("src")); - elecMuPaths_ =triggerExtras.getParameter >("pathsELECMU"); - diMuonPaths_ =triggerExtras.getParameter >("pathsDIMUON"); - diElecPaths_ =triggerExtras.getParameter >("pathsDIELEC"); + processName_ = triggerExtras.getParameter("src").process(); + elecMuPaths_ = triggerExtras.getParameter >("pathsELECMU"); + diMuonPaths_ = triggerExtras.getParameter >("pathsDIMUON"); + diElecPaths_ = triggerExtras.getParameter >("pathsDIELEC"); } // massExtras is optional; in case it's not found no mass // window cuts are applied for the same flavor monitor @@ -116,7 +118,7 @@ namespace HLTOfflineDQMTopDiLepton { // and don't forget to do the histogram booking folder_=cfg.getParameter("directory"); - triggerEventWithRefsTag_ = iC.consumes< trigger::TriggerEventWithRefs >(edm::InputTag("hltTriggerSummaryRAW","","HLT")); + triggerEventWithRefsTag_ = iC.consumes< trigger::TriggerEventWithRefs >(edm::InputTag("hltTriggerSummaryRAW","",processName_)); } @@ -389,12 +391,12 @@ namespace HLTOfflineDQMTopDiLepton { bool dielec = false; bool dimuon = false; // consider only path from triggerPaths - TString name = triggerNames.triggerNames()[i].c_str(); + string name = triggerNames.triggerNames()[i]; for (unsigned int j=0; j& moduleLabels(hltConfig.moduleLabels(triggerIndex)); const unsigned int moduleIndex(triggerTable->index(triggerIndex)); @@ -510,7 +512,7 @@ namespace HLTOfflineDQMTopDiLepton { const string& moduleLabel(moduleLabels[k]); const string moduleType(hltConfig.moduleType(moduleLabel)); // check whether the module is packed up in TriggerEventWithRef product - const unsigned int filterIndex(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabel,"","HLT"))); + const unsigned int filterIndex(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabel,"",processName_))); if (filterIndexsize()) { triggerEventWithRefsHandle->getObjects(filterIndex,electronIds_,electronRefs_); const unsigned int nElectrons(electronIds_.size()); @@ -533,7 +535,7 @@ namespace HLTOfflineDQMTopDiLepton { if (kElec > 0 && kMuon < 1 && isoElecs.size()>0) { const string& moduleLabelElec(moduleLabels[kElec]); const string moduleTypeElec(hltConfig.moduleType(moduleLabelElec)); - const unsigned int filterIndexElec(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelElec,"","HLT"))); + const unsigned int filterIndexElec(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelElec,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexElec,electronIds_,electronRefs_); const unsigned int nElectrons(electronIds_.size()); double deltar1 = 600.; @@ -570,7 +572,7 @@ namespace HLTOfflineDQMTopDiLepton { if (kMuon > 0 && kElec < 1 && isoMuons.size()>0) { const string& moduleLabelMuon(moduleLabels[kMuon]); const string moduleTypeMuon(hltConfig.moduleType(moduleLabelMuon)); - const unsigned int filterIndexMuon(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelMuon,"","HLT"))); + const unsigned int filterIndexMuon(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelMuon,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexMuon,muonIds_,muonRefs_); trigger::VRmuon myMuonRefs; const unsigned int nMuons(muonIds_.size()); @@ -644,7 +646,7 @@ namespace HLTOfflineDQMTopDiLepton { if (kElec > 0 && kMuon > 0 && isoElecs.size()>0) { const string& moduleLabelElec(moduleLabels[kElec]); const string moduleTypeElec(hltConfig.moduleType(moduleLabelElec)); - const unsigned int filterIndexElec(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelElec,"","HLT"))); + const unsigned int filterIndexElec(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelElec,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexElec,electronIds_,electronRefs_); const unsigned int nElectrons(electronIds_.size()); double deltar = 600.; @@ -665,7 +667,7 @@ namespace HLTOfflineDQMTopDiLepton { if (kElec > 0 && kMuon > 0 && isoMuons.size()>0) { const string& moduleLabelMuon(moduleLabels[kMuon]); const string moduleTypeMuon(hltConfig.moduleType(moduleLabelMuon)); - const unsigned int filterIndexMuon(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelMuon,"","HLT"))); + const unsigned int filterIndexMuon(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelMuon,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexMuon,muonIds_,muonRefs_); const unsigned int nMuons(muonIds_.size()); if (isoMuons.size()<1) continue; @@ -751,13 +753,11 @@ TopDiLeptonHLTOfflineDQM::dqmBeginRun(const edm::Run& iRun, const edm::EventSetu using namespace std; using namespace edm; - std::string processName = "HLT"; - bool changed(true); - if (!hltConfig_.init(iRun,iSetup,processName,changed)) { + if (!hltConfig_.init(iRun,iSetup,"*",changed)) { edm::LogWarning( "TopSingleLeptonHLTOfflineDQM" ) << "Config extraction failure with process name " - << processName + << hltConfig_.processName() << "\n"; return; } diff --git a/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc b/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc index 05f511a325cce..d8bc5b81f9fe9 100644 --- a/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc +++ b/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc @@ -133,9 +133,11 @@ namespace HLTOfflineDQMTopSingleLepton { } // triggerExtras are optional; they may be omitted or empty + processName_ = "HLT"; if( cfg.existsAs("triggerExtras") ){ edm::ParameterSet triggerExtras=cfg.getParameter("triggerExtras"); triggerTable_= iC.consumes< edm::TriggerResults >(triggerExtras.getParameter("src")); + processName_ = triggerExtras.getParameter("src").process(); triggerPaths_=triggerExtras.getParameter >("paths"); } @@ -151,7 +153,7 @@ namespace HLTOfflineDQMTopSingleLepton { // and don't forget to do the histogram booking folder_=cfg.getParameter("directory"); - triggerEventWithRefsTag_ = iC.consumes< trigger::TriggerEventWithRefs >(edm::InputTag("hltTriggerSummaryRAW","","HLT")); + triggerEventWithRefsTag_ = iC.consumes< trigger::TriggerEventWithRefs >(edm::InputTag("hltTriggerSummaryRAW","",processName_)); } @@ -497,14 +499,14 @@ namespace HLTOfflineDQMTopSingleLepton { // loop over trigger paths for(unsigned int i=0; i& moduleLabels(hltConfig.moduleLabels(triggerIndex)); const unsigned int moduleIndex(triggerTable->index(triggerIndex)); @@ -524,7 +526,7 @@ namespace HLTOfflineDQMTopSingleLepton { const string& moduleLabel(moduleLabels[k]); const string moduleType(hltConfig.moduleType(moduleLabel)); // check whether the module is packed up in TriggerEventWithRef product - const unsigned int filterIndex(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabel,"","HLT"))); + const unsigned int filterIndex(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabel,"",processName_))); if (filterIndexsize()) { triggerEventWithRefsHandle->getObjects(filterIndex,electronIds_,electronRefs_); const unsigned int nElectrons(electronIds_.size()); @@ -551,7 +553,7 @@ namespace HLTOfflineDQMTopSingleLepton { if (kElec > 0) { const string& moduleLabelElec(moduleLabels[kElec]); const string moduleTypeElec(hltConfig.moduleType(moduleLabelElec)); - const unsigned int filterIndexElec(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelElec,"","HLT"))); + const unsigned int filterIndexElec(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelElec,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexElec,electronIds_,electronRefs_); for (unsigned int inde = 0; inde < isoElecs.size(); inde++) { double deltar = deltaR(*electronRefs_[0],*isoElecs[inde]); @@ -569,7 +571,7 @@ namespace HLTOfflineDQMTopSingleLepton { if (kMuon > 0) { const string& moduleLabelMuon(moduleLabels[kMuon]); const string moduleTypeMuon(hltConfig.moduleType(moduleLabelMuon)); - const unsigned int filterIndexMuon(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelMuon,"","HLT"))); + const unsigned int filterIndexMuon(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelMuon,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexMuon,muonIds_,muonRefs_); for (unsigned int indm = 0; indm < isoMuons.size(); indm++) { double deltar = deltaR(*muonRefs_[0],*isoMuons[indm]); @@ -592,7 +594,7 @@ namespace HLTOfflineDQMTopSingleLepton { if (kJet > 0) { const string& moduleLabelJet(moduleLabels[kJet]); const string moduleTypeJet(hltConfig.moduleType(moduleLabelJet)); - const unsigned int filterIndexJet(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelJet,"","HLT"))); + const unsigned int filterIndexJet(triggerEventWithRefsHandle->filterIndex(edm::InputTag(moduleLabelJet,"",processName_))); triggerEventWithRefsHandle->getObjects(filterIndexJet,pfjetIds_,pfjetRefs_); for (unsigned int indj = 0; indj < correctedJets.size(); indj++) { double deltar1 = deltaR(*pfjetRefs_[0],correctedJets[indj]); @@ -714,13 +716,11 @@ TopSingleLeptonHLTOfflineDQM::dqmBeginRun(const edm::Run& iRun, const edm::Event using namespace std; using namespace edm; - std::string processName = "HLT"; - bool changed(true); - if (!hltConfig_.init(iRun,iSetup,processName,changed)) { + if (!hltConfig_.init(iRun,iSetup,"*",changed)) { edm::LogWarning( "TopSingleLeptonHLTOfflineDQM" ) << "Config extraction failure with process name " - << processName + << hltConfig_.processName() << "\n"; return; } From 45697b71b236a9ce37b06027afa8353c9e73fe2a Mon Sep 17 00:00:00 2001 From: Elvire Bouvier Date: Fri, 4 Apr 2014 12:36:45 +0200 Subject: [PATCH 35/59] remove elastoplast --- DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc b/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc index d8bc5b81f9fe9..00ae3fb602df7 100644 --- a/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc +++ b/DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc @@ -518,10 +518,6 @@ namespace HLTOfflineDQMTopSingleLepton { unsigned int kElec=0; unsigned int kMuon=0; unsigned int kJet=0; - // FIXME: This assert is needed to avoid a segfault when moduleIndex is >= the size of moduleLabels. - // This does happen in relval 50102 for gcc4.9.0, and the problem needs to be fixed. - // The assert does not fire for gcc4.8.1. The difference is not understood. - assert(moduleIndex < moduleLabels.size()); for (unsigned int k=0; k<=moduleIndex; ++k) { const string& moduleLabel(moduleLabels[k]); const string moduleType(hltConfig.moduleType(moduleLabel)); From 3255c00d2ac2cb9effdbb4b7b42c3ebec336a197 Mon Sep 17 00:00:00 2001 From: Nancy Date: Fri, 4 Apr 2014 13:07:57 +0200 Subject: [PATCH 36/59] Fix crash in HI sequence. Was due to accessing the Offline vertex collection, not present in the HI reco --- DQMOffline/EGamma/plugins/PhotonAnalyzer.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc index 127c3ffbd09f9..1bad1ebcded70 100755 --- a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc +++ b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc @@ -501,8 +501,10 @@ void PhotonAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& esup ) edm::Handle vtxH; - e.getByToken(offline_pvToken_, vtxH); - h_nRecoVtx_ ->Fill (float(vtxH->size())); + if ( !isHeavyIon_) { + e.getByToken(offline_pvToken_, vtxH); + h_nRecoVtx_ ->Fill (float(vtxH->size())); + } // Create array to hold #photons/event information int nPho[100][3][3]; @@ -770,7 +772,7 @@ void PhotonAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& esup ) fill3DHistoVector(h_phoE_, aPho->energy(),cut,type,part); fill3DHistoVector(h_phoSigmaEoverE_, aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy(),cut,type,part); - fill3DHistoVector(p_phoSigmaEoverEvsNVtx_, float(vtxH->size()), aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy(),cut,type,part); + if ( !isHeavyIon_) fill3DHistoVector(p_phoSigmaEoverEvsNVtx_, float(vtxH->size()), aPho->getCorrectedEnergyError(aPho->getCandidateP4type())/aPho->energy(),cut,type,part); fill3DHistoVector(h_phoEt_,aPho->et(), cut,type,part); From d49bfa67655c1f31c3fb1d7db45c9bb18deb37aa Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 6 Apr 2014 00:47:35 +0200 Subject: [PATCH 37/59] Adapt code to DQMEDAnalyzer for multithreaded framework running --- DQMOffline/Trigger/src/GeneralHLTOffline.cc | 145 ++++++++++---------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/DQMOffline/Trigger/src/GeneralHLTOffline.cc b/DQMOffline/Trigger/src/GeneralHLTOffline.cc index d124ce980dcf1..40fcf9f3a1e8e 100644 --- a/DQMOffline/Trigger/src/GeneralHLTOffline.cc +++ b/DQMOffline/Trigger/src/GeneralHLTOffline.cc @@ -21,6 +21,7 @@ Description: [one line class summary] // user include files #include "DQMServices/Core/interface/DQMStore.h" #include "DQMServices/Core/interface/MonitorElement.h" +#include "DQMServices/Core/interface/DQMEDAnalyzer.h" #include "DataFormats/Common/interface/TriggerResults.h" #include "DataFormats/HLTReco/interface/TriggerObject.h" @@ -44,22 +45,22 @@ Description: [one line class summary] // class declaration // -class GeneralHLTOffline : public edm::EDAnalyzer { +class GeneralHLTOffline : public DQMEDAnalyzer { public: explicit GeneralHLTOffline(const edm::ParameterSet&); ~GeneralHLTOffline(); private: - virtual void beginJob() override; + // virtual void beginJob() override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endJob() override; - virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - virtual void endRun(edm::Run const&, edm::EventSetup const&) override; + virtual void bookHistograms(DQMStore::IBooker &, edm::Run const & iRun, + edm::EventSetup const & iSetup) override; + virtual void dqmBeginRun(edm::Run const& iRun,edm::EventSetup const& iSetup) override; virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - virtual void setupHltMatrix(const std::string &, int); + virtual void setupHltMatrix(DQMStore::IBooker & iBooker, const std::string &, int); virtual void fillHltMatrix(const std::string &, const std::string &, double, double, bool); @@ -81,8 +82,12 @@ class GeneralHLTOffline : public edm::EDAnalyzer { edm::EDGetTokenT triggerResultsToken; edm::EDGetTokenT triggerSummaryToken; - DQMStore * dbe_; MonitorElement * cppath_; + std::map cppath_mini_; + std::map me_etaphi_; + std::map me_eta_; + std::map me_phi_; + }; // @@ -90,7 +95,6 @@ class GeneralHLTOffline : public edm::EDAnalyzer { // GeneralHLTOffline::GeneralHLTOffline(const edm::ParameterSet& ps):streamA_found_(false), hlt_menu_(""), - dbe_(0), cppath_(0) { debugPrint = false; outputPrint = false; @@ -168,10 +172,12 @@ GeneralHLTOffline::analyze(const edm::Event& iEvent, const std::string &label = datasetNames[iPD]; std::string fullPathToCPP = "HLT/GeneralHLTOffline/" + label + "/cppath_" + label + hlt_menu_; - MonitorElement * ME_mini_cppath = dbe_->get(fullPathToCPP); + MonitorElement * ME_mini_cppath = NULL; TH1F * hist_mini_cppath = NULL; - if (ME_mini_cppath) + if( cppath_mini_.find(fullPathToCPP)!=cppath_mini_.end() ){ + ME_mini_cppath = cppath_mini_[fullPathToCPP]; hist_mini_cppath = ME_mini_cppath->getTH1F(); + } if (hist_mini_cppath) { TAxis * axis = hist_mini_cppath->GetXaxis(); @@ -287,26 +293,11 @@ GeneralHLTOffline::analyze(const edm::Event& iEvent, } -// ------------ method called once each job just before starting event loop ------------ -void -GeneralHLTOffline::beginJob() { - if (debugPrint) - std::cout << "Inside begin job" << std::endl; - - dbe_ = edm::Service().operator->(); - if (dbe_) - dbe_->setCurrentFolder(plotDirectoryName); -} - -// ------------ method called once each job just after ending the event loop ------------ -void -GeneralHLTOffline::endJob() { -} // ------------ method called when starting to processes a run ------------ void -GeneralHLTOffline::beginRun(edm::Run const& iRun, - edm::EventSetup const& iSetup) { +GeneralHLTOffline::dqmBeginRun(edm::Run const& iRun, + edm::EventSetup const& iSetup) { if (debugPrint) std::cout << "Inside beginRun" << std::endl; @@ -315,6 +306,15 @@ GeneralHLTOffline::beginRun(edm::Run const& iRun, PDsVectorPathsVector.clear(); AddedDatasets.clear(); +} + + +// ------------ method called to book histograms before starting event loop ------------ +void GeneralHLTOffline::bookHistograms(DQMStore::IBooker & iBooker, + edm::Run const & iRun, + edm::EventSetup const & iSetup) +{ + iBooker.setCurrentFolder(plotDirectoryName) ; bool changed = true; if (!hlt_config_.init(iRun, iSetup, hltTag, changed)) { @@ -336,11 +336,11 @@ GeneralHLTOffline::beginRun(edm::Run const& iRun, //////////// Book a simple ME - dbe_->setCurrentFolder("HLT/GeneralHLTOffline/"); - dbe_->bookString("hltMenuName", hlt_menu_.c_str()); - cppath_ = dbe_->book1D("cppath" + hlt_menu_, - "Counts/Path", - hlt_config_.size(), 0, hlt_config_.size()); + iBooker.setCurrentFolder("HLT/GeneralHLTOffline/"); + iBooker.bookString("hltMenuName", hlt_menu_.c_str()); + cppath_ = iBooker.book1D("cppath" + hlt_menu_, + "Counts/Path", + hlt_config_.size(), 0, hlt_config_.size()); const std::vector &nameStreams = hlt_config_.streamNames(); std::vector::const_iterator si = nameStreams.begin(); @@ -449,19 +449,19 @@ GeneralHLTOffline::beginRun(edm::Run const& iRun, if (debugPrint) std::cout <<"Found PD: " << datasetNames[i] << std::endl; - setupHltMatrix(datasetNames[i], i); + setupHltMatrix(iBooker, datasetNames[i], i); } // end of loop over dataset names } // if stream A found } // end of beginRun -// ------------ method called when ending the processing of a run ------------ -void GeneralHLTOffline::endRun(edm::Run const&, edm::EventSetup const&) { - if (debugPrint) - std::cout << " endRun called " << std::endl; -} +// // ------------ method called when ending the processing of a run ------------ +// void GeneralHLTOffline::endRun(edm::Run const&, edm::EventSetup const&) { +// if (debugPrint) +// std::cout << " endRun called " << std::endl; +// } -void GeneralHLTOffline::setupHltMatrix(const std::string & label, int iPD) { +void GeneralHLTOffline::setupHltMatrix(DQMStore::IBooker & iBooker, const std::string & label, int iPD) { std::string h_name; std::string h_title; std::string h_name_1dEta; @@ -478,7 +478,7 @@ void GeneralHLTOffline::setupHltMatrix(const std::string & label, int iPD) { PD_Folder = TString("HLT/GeneralHLTOffline/"+label); - dbe_->setCurrentFolder(PD_Folder.c_str()); + iBooker.setCurrentFolder(PD_Folder.c_str()); h_name = "HLT_" +label + "_EtaVsPhi"; h_title = "HLT_" + label + "_EtaVsPhi"; h_name_1dEta = "HLT_" + label + "_1dEta"; @@ -493,25 +493,24 @@ void GeneralHLTOffline::setupHltMatrix(const std::string & label, int iPD) { Double_t EtaMax = 2.610; Double_t PhiMax = 17.0*TMath::Pi()/16.0; Double_t PhiMaxFine = 33.0*TMath::Pi()/32.0; - MonitorElement * service_me = NULL; - service_me = dbe_->book2D(h_name.c_str(), - h_title.c_str(), - numBinsEta, -EtaMax, EtaMax, - numBinsPhi, -PhiMax, PhiMax); - if (TH1 * service_histo = service_me->getTH2F()) + me_etaphi_[h_name] = iBooker.book2D(h_name.c_str(), + h_title.c_str(), + numBinsEta, -EtaMax, EtaMax, + numBinsPhi, -PhiMax, PhiMax); + if (TH1 * service_histo = me_etaphi_[h_name]->getTH2F()) service_histo->SetMinimum(0); - service_me = dbe_->book1D(h_name_1dEta.c_str(), - h_title_1dEta.c_str(), - numBinsEtaFine, -EtaMax, EtaMax); - if (TH1 * service_histo = service_me->getTH1F()) + me_eta_[h_name_1dEta] = iBooker.book1D(h_name_1dEta.c_str(), + h_title_1dEta.c_str(), + numBinsEtaFine, -EtaMax, EtaMax); + if (TH1 * service_histo = me_eta_[h_name_1dEta]->getTH1F()) service_histo->SetMinimum(0); - service_me = dbe_->book1D(h_name_1dPhi.c_str(), - h_title_1dPhi.c_str(), - numBinsPhiFine, -PhiMaxFine, PhiMaxFine); - if (TH1 * service_histo = service_me->getTH1F()) + me_phi_[h_name_1dPhi] = iBooker.book1D(h_name_1dPhi.c_str(), + h_title_1dPhi.c_str(), + numBinsPhiFine, -PhiMaxFine, PhiMaxFine); + if (TH1 * service_histo = me_phi_[h_name_1dPhi]->getTH1F()) service_histo->SetMinimum(0); @@ -519,18 +518,18 @@ void GeneralHLTOffline::setupHltMatrix(const std::string & label, int iPD) { // paths std::string folderz; folderz = TString("HLT/GeneralHLTOffline/"+label); - dbe_->setCurrentFolder(folderz.c_str()); + iBooker.setCurrentFolder(folderz.c_str()); std::string dnamez = "cppath_" + label + "_" + hlt_menu_; int sizez = PDsVectorPathsVector[iPD].size(); TH1F * hist_mini_cppath = NULL; - MonitorElement * hist_mini_cppath_me = dbe_->book1D(dnamez.c_str(), - dnamez.c_str(), - sizez, - 0, - sizez); - if (hist_mini_cppath_me) - hist_mini_cppath = hist_mini_cppath_me->getTH1F(); + cppath_mini_[dnamez] = iBooker.book1D(dnamez.c_str(), + dnamez.c_str(), + sizez, + 0, + sizez); + if( cppath_mini_[dnamez] ) + hist_mini_cppath = cppath_mini_[dnamez]->getTH1F(); unsigned int jPath; for (unsigned int iPath = 0; iPath < PDsVectorPathsVector[iPD].size(); iPath++) { @@ -570,7 +569,6 @@ void GeneralHLTOffline::fillHltMatrix(const std::string & label, std::string fullPathToME1dPhiPath; std::string fullPathToCPP; - fullPathToME = "HLT/GeneralHLTOffline/HLT_" + label + "_EtaVsPhi"; fullPathToME1dEta = "HLT/GeneralHLTOffline/HLT_" + label + "_1dEta"; fullPathToME1dPhi = "HLT/GeneralHLTOffline/HLT_" + label + "_1dPhi"; @@ -587,9 +585,11 @@ void GeneralHLTOffline::fillHltMatrix(const std::string & label, TH1F * hist_mini_cppath = NULL; - MonitorElement * ME_mini_cppath = dbe_->get(fullPathToCPP); - if (ME_mini_cppath) + MonitorElement * ME_mini_cppath = NULL; + if( cppath_mini_.find(fullPathToCPP)!=cppath_mini_.end() ){ + ME_mini_cppath = cppath_mini_[fullPathToCPP]; hist_mini_cppath = ME_mini_cppath->getTH1F(); + } // fill top-level histograms if (first_count) { @@ -598,14 +598,16 @@ void GeneralHLTOffline::fillHltMatrix(const std::string & label, << fullPathToME1dPhi << " path " << path << " Phi " << Phi << " Eta " << Eta << std::endl; - MonitorElement * ME_1dEta = dbe_->get(fullPathToME1dEta); - if (ME_1dEta) { + MonitorElement * ME_1dEta = NULL; + if( me_eta_.find(fullPathToME1dEta)!=me_eta_.end() ){ + ME_1dEta = me_eta_[fullPathToME1dEta]; TH1F * hist_1dEta = ME_1dEta->getTH1F(); if (hist_1dEta) hist_1dEta->Fill(Eta); } - MonitorElement * ME_1dPhi = dbe_->get(fullPathToME1dPhi); - if (ME_1dPhi) { + MonitorElement * ME_1dPhi = NULL; + if( me_phi_.find(fullPathToME1dPhi)!=me_phi_.end() ){ + ME_1dPhi = me_phi_[fullPathToME1dPhi]; TH1F * hist_1dPhi = ME_1dPhi->getTH1F(); if (hist_1dPhi) hist_1dPhi->Fill(Phi); @@ -614,8 +616,9 @@ void GeneralHLTOffline::fillHltMatrix(const std::string & label, << fullPathToME1dPhi << " path " << path << " Phi " << Phi << " Eta " << Eta << std::endl; } - MonitorElement * ME_2d = dbe_->get(fullPathToME); - if (ME_2d) { + MonitorElement * ME_2d = NULL; + if( me_etaphi_.find(fullPathToME)!=me_etaphi_.end() ){ + ME_2d = me_etaphi_[fullPathToME]; TH2F * hist_2d = ME_2d->getTH2F(); if (hist_2d) hist_2d->Fill(Eta, Phi); From b8e8988d0b54ac3d843d60105d8c60bb622b24db Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:44:02 +0200 Subject: [PATCH 38/59] New analyze script --- analyze_gedGsfE.tcsh | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 analyze_gedGsfE.tcsh diff --git a/analyze_gedGsfE.tcsh b/analyze_gedGsfE.tcsh new file mode 100644 index 0000000000000..fb8e6213a01fa --- /dev/null +++ b/analyze_gedGsfE.tcsh @@ -0,0 +1,75 @@ +#!/bin/bash + +echo $1 $2 + +if [ "$1" == "?" ] +then + echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "defaut = j r" + exit +fi + +if [ "$1" != "i" ] +then + echo "pas d'interaction" + echo "defaut = batch" + CHOIX_INTERACTION='electronBsub 8nh /afs/cern.ch/cms/utils/oval run analyze.Val' +else + echo "interaction" + CHOIX_INTERACTION='/afs/cern.ch/cms/utils/oval run analyze.Val' +fi + +#echo $1 $CHOIX_INTERACTION + +if [ "$2" != "r" ] +then + if [ "$2" != "f" ] + then + if [ "$2" != "p" ] + then + echo "pas de choix calcul" + echo "defaut = FULL" + CHOIX_CALCUL='Full' + else + #echo "PILES PileUp" + CHOIX_CALCUL='PileUp' + fi + else + #echo "FAST" + CHOIX_CALCUL='Fast' + fi +else + #echo "FULL" + CHOIX_CALCUL='Full' +fi + +#echo $2 $CHOIX_CALCUL + +case $CHOIX_CALCUL in +Full) echo "Full" + echo "--" + for i in Pt10Startup_UP15 Pt1000Startup_UP15 Pt35Startup_UP15 TTbarStartup_13 ZEEStartup_13 QcdPt80Pt120Startup_13 + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +PileUp) echo "PileUp" + echo "++" + for i in TTbarStartup ZEEStartup + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +Fast) echo "Fast" + echo "**" + for i in TTbarStartup ZEEStartup + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +esac + + From 196ad770564ffcdf6a34047987b1498612cda6e5 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:44:24 +0200 Subject: [PATCH 39/59] Delete analyze_gedGsfE.tcsh --- analyze_gedGsfE.tcsh | 75 -------------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 analyze_gedGsfE.tcsh diff --git a/analyze_gedGsfE.tcsh b/analyze_gedGsfE.tcsh deleted file mode 100644 index fb8e6213a01fa..0000000000000 --- a/analyze_gedGsfE.tcsh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -echo $1 $2 - -if [ "$1" == "?" ] -then - echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" - echo "defaut = j r" - exit -fi - -if [ "$1" != "i" ] -then - echo "pas d'interaction" - echo "defaut = batch" - CHOIX_INTERACTION='electronBsub 8nh /afs/cern.ch/cms/utils/oval run analyze.Val' -else - echo "interaction" - CHOIX_INTERACTION='/afs/cern.ch/cms/utils/oval run analyze.Val' -fi - -#echo $1 $CHOIX_INTERACTION - -if [ "$2" != "r" ] -then - if [ "$2" != "f" ] - then - if [ "$2" != "p" ] - then - echo "pas de choix calcul" - echo "defaut = FULL" - CHOIX_CALCUL='Full' - else - #echo "PILES PileUp" - CHOIX_CALCUL='PileUp' - fi - else - #echo "FAST" - CHOIX_CALCUL='Fast' - fi -else - #echo "FULL" - CHOIX_CALCUL='Full' -fi - -#echo $2 $CHOIX_CALCUL - -case $CHOIX_CALCUL in -Full) echo "Full" - echo "--" - for i in Pt10Startup_UP15 Pt1000Startup_UP15 Pt35Startup_UP15 TTbarStartup_13 ZEEStartup_13 QcdPt80Pt120Startup_13 - do - echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" - ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE - done - ;; -PileUp) echo "PileUp" - echo "++" - for i in TTbarStartup ZEEStartup - do - echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" - ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE - done - ;; -Fast) echo "Fast" - echo "**" - for i in TTbarStartup ZEEStartup - do - echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" - ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE - done - ;; -esac - - From 2306601a2925d8fd6d43ac52ca788b5fb28c535c Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:44:58 +0200 Subject: [PATCH 40/59] New analyze script --- .../RecoEgamma/test/analyze_gedGsfE.tcsh | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Validation/RecoEgamma/test/analyze_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh b/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh new file mode 100644 index 0000000000000..fb8e6213a01fa --- /dev/null +++ b/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh @@ -0,0 +1,75 @@ +#!/bin/bash + +echo $1 $2 + +if [ "$1" == "?" ] +then + echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "defaut = j r" + exit +fi + +if [ "$1" != "i" ] +then + echo "pas d'interaction" + echo "defaut = batch" + CHOIX_INTERACTION='electronBsub 8nh /afs/cern.ch/cms/utils/oval run analyze.Val' +else + echo "interaction" + CHOIX_INTERACTION='/afs/cern.ch/cms/utils/oval run analyze.Val' +fi + +#echo $1 $CHOIX_INTERACTION + +if [ "$2" != "r" ] +then + if [ "$2" != "f" ] + then + if [ "$2" != "p" ] + then + echo "pas de choix calcul" + echo "defaut = FULL" + CHOIX_CALCUL='Full' + else + #echo "PILES PileUp" + CHOIX_CALCUL='PileUp' + fi + else + #echo "FAST" + CHOIX_CALCUL='Fast' + fi +else + #echo "FULL" + CHOIX_CALCUL='Full' +fi + +#echo $2 $CHOIX_CALCUL + +case $CHOIX_CALCUL in +Full) echo "Full" + echo "--" + for i in Pt10Startup_UP15 Pt1000Startup_UP15 Pt35Startup_UP15 TTbarStartup_13 ZEEStartup_13 QcdPt80Pt120Startup_13 + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +PileUp) echo "PileUp" + echo "++" + for i in TTbarStartup ZEEStartup + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +Fast) echo "Fast" + echo "**" + for i in TTbarStartup ZEEStartup + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +esac + + From 73e1b37fc1a490291dc747b2f4866ec160a99b41 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:45:22 +0200 Subject: [PATCH 41/59] Create finalize_gedGsfE.tcsh --- .../RecoEgamma/test/finalize_gedGsfE.tcsh | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Validation/RecoEgamma/test/finalize_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh new file mode 100644 index 0000000000000..226a1a6344661 --- /dev/null +++ b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh @@ -0,0 +1,75 @@ +#!/bin/bash + +echo $1 $2 + +if [ "$1" == "?" ] +then + echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "defaut = j r" + exit +fi + +if [ "$1" != "i" ] +then + echo "pas d'interaction" + echo "defaut = batch" + CHOIX_INTERACTION='electronBsub 8nh /afs/cern.ch/cms/utils/oval run finalize.Val' +else + echo "interaction" + CHOIX_INTERACTION='/afs/cern.ch/cms/utils/oval run finalize.Val' +fi + +#echo $1 $CHOIX_INTERACTION + +if [ "$2" != "r" ] +then + if [ "$2" != "f" ] + then + if [ "$2" != "p" ] + then + echo "pas de choix calcul" + echo "defaut = FULL" + CHOIX_CALCUL='Full' + else + #echo "PILES PileUp" + CHOIX_CALCUL='PileUp' + fi + else + #echo "FAST" + CHOIX_CALCUL='Fast' + fi +else + #echo "FULL" + CHOIX_CALCUL='Full' +fi + +#echo $2 $CHOIX_CALCUL + +case $CHOIX_CALCUL in +Full) echo "Full" + echo "--" + for i in Pt10Startup_UP15 Pt1000Startup_UP15 Pt35Startup_UP15 TTbarStartup_13 ZEEStartup_13 QcdPt80Pt120Startup_13 + do + echo " -- ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +PileUp) echo "PileUp" + echo "++" + for i in TTbarStartup ZEEStartup + do + echo " ++ ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +Fast) echo "Fast" + echo "**" + for i in TTbarStartup ZEEStartup + do + echo " ** ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +esac + + From d4169ebfc419f58b05b60cca7ff5ad9fcf3655cf Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:45:53 +0200 Subject: [PATCH 42/59] new store script --- Validation/RecoEgamma/test/store_gedGsfE.tcsh | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Validation/RecoEgamma/test/store_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/store_gedGsfE.tcsh b/Validation/RecoEgamma/test/store_gedGsfE.tcsh new file mode 100644 index 0000000000000..339256f80382a --- /dev/null +++ b/Validation/RecoEgamma/test/store_gedGsfE.tcsh @@ -0,0 +1,75 @@ +#!/bin/bash + +echo $1 $2 + +if [ "$1" == "?" ] +then + echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "defaut = j r" + exit +fi + +if [ "$1" != "i" ] +then + echo "pas d'interaction" + echo "defaut = batch" + CHOIX_INTERACTION='electronBsub 1nh /afs/cern.ch/cms/utils/oval run store.Val' +else + echo "interaction" + CHOIX_INTERACTION='/afs/cern.ch/cms/utils/oval run store.Val' +fi + +#echo $1 $CHOIX_INTERACTION + +if [ "$2" != "r" ] +then + if [ "$2" != "f" ] + then + if [ "$2" != "p" ] + then + echo "pas de choix calcul" + echo "defaut = FULL" + CHOIX_CALCUL='Full' + else + #echo "PILES PileUp" + CHOIX_CALCUL='PileUp' + fi + else + #echo "FAST" + CHOIX_CALCUL='Fast' + fi +else + #echo "FULL" + CHOIX_CALCUL='Full' +fi + +echo $2 $CHOIX_CALCUL + +case $CHOIX_CALCUL in +Full) echo "Full" + echo "--" + for i in Pt10Startup_UP15 Pt1000Startup_UP15 Pt35Startup_UP15 TTbarStartup_13 ZEEStartup_13 QcdPt80Pt120Startup_13 + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +PileUp) echo "PileUp" + echo "++" + for i in TTbarStartup ZEEStartup + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + #${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +Fast) echo "Fast" + echo "**" + for i in TTbarStartup ZEEStartup + do + echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" + #${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + done + ;; +esac + + From e8768014bde8f790539df17274630126fd5faf9e Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:47:09 +0200 Subject: [PATCH 43/59] Delete analyze_fast_gedGsfE.tcsh --- Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh deleted file mode 100755 index b2ea7454258f0..0000000000000 --- a/Validation/RecoEgamma/test/analyze_fast_gedGsfE.tcsh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/tcsh -./electronBsub 8nh oval run analyze.ValFastTTbarStartup_gedGsfE -./electronBsub 8nh oval run analyze.ValFastZEEStartup_gedGsfE - From ca7ea53cd8746c249c610f083954ba8124c2e2cf Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:47:20 +0200 Subject: [PATCH 44/59] Delete analyze_full_gedGsfE.pu.tcsh --- Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh deleted file mode 100755 index 5ccf649ea9488..0000000000000 --- a/Validation/RecoEgamma/test/analyze_full_gedGsfE.pu.tcsh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/tcsh -./electronBsub 1nh oval run analyze.ValPileUpTTbarStartup_gedGsfE -./electronBsub 1nh oval run analyze.ValPileUpZEEStartup_gedGsfE - From e5cb26e7b08e6f89f06a8760d3c99da4f22a923e Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:47:30 +0200 Subject: [PATCH 45/59] Delete analyze_full_gedGsfE.su.tcsh --- Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh diff --git a/Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh b/Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh deleted file mode 100755 index 9e0638326ec5a..0000000000000 --- a/Validation/RecoEgamma/test/analyze_full_gedGsfE.su.tcsh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/tcsh -./electronBsub 8nh oval run analyze.ValFullPt10Startup_UP15_gedGsfE -./electronBsub 8nh oval run analyze.ValFullPt1000Startup_UP15_gedGsfE -./electronBsub 8nh oval run analyze.ValFullPt35Startup_UP15_gedGsfE -./electronBsub 8nh oval run analyze.ValFullTTbarStartup_13_gedGsfE -./electronBsub 8nh oval run analyze.ValFullZEEStartup_13_gedGsfE -./electronBsub 8nh oval run analyze.ValFullQcdPt80Pt120Startup_13_gedGsfE - From 21585a306bb90cf3e013d945bff573da4eddd4c3 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:47:43 +0200 Subject: [PATCH 46/59] Delete finalize_fast_gedGsfE.tcsh --- Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh deleted file mode 100755 index c68a2618afc01..0000000000000 --- a/Validation/RecoEgamma/test/finalize_fast_gedGsfE.tcsh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/tcsh -./electronBsub 8nh oval run finalize.ValFastTTbarStartup_gedGsfE -./electronBsub 8nh oval run finalize.ValFastZEEStartup_gedGsfE From 232c2bd2f5487458813e10a02680c05b53f11429 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:47:55 +0200 Subject: [PATCH 47/59] Delete finalize_full_gedGsfE.pu.tcsh --- Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh deleted file mode 100755 index f9c94952c8066..0000000000000 --- a/Validation/RecoEgamma/test/finalize_full_gedGsfE.pu.tcsh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/tcsh -./electronBsub 1nh oval run finalize.ValPileUpTTbarStartup_gedGsfE -./electronBsub 1nh oval run finalize.ValPileUpZEEStartup_gedGsfE From 951b92a4aed3e8413a68cc37a487245017cfd037 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:48:08 +0200 Subject: [PATCH 48/59] Delete finalize_full_gedGsfE.su.tcsh --- Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh diff --git a/Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh b/Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh deleted file mode 100755 index aff0a0e609e4b..0000000000000 --- a/Validation/RecoEgamma/test/finalize_full_gedGsfE.su.tcsh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/tcsh -./electronBsub 8nh oval run finalize.ValFullPt10Startup_UP15_gedGsfE -./electronBsub 8nh oval run finalize.ValFullPt1000Startup_UP15_gedGsfE -./electronBsub 8nh oval run finalize.ValFullPt35Startup_UP15_gedGsfE -./electronBsub 8nh oval run finalize.ValFullTTbarStartup_13_gedGsfE -./electronBsub 8nh oval run finalize.ValFullZEEStartup_13_gedGsfE -./electronBsub 8nh oval run finalize.ValFullQcdPt80Pt120Startup_13_gedGsfE From 2c86aa37c0665be039c94b41a330e2f04cace056 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:48:20 +0200 Subject: [PATCH 49/59] Delete store_fast_gedGsfE.tcsh --- Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh diff --git a/Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh b/Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh deleted file mode 100755 index b1728a2f8688f..0000000000000 --- a/Validation/RecoEgamma/test/store_fast_gedGsfE.tcsh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/tcsh -oval run store.ValFastTTbarStartup_gedGsfE -oval run store.ValFastZEEStartup_gedGsfE From 43f91f6f77f30e92fb7b99d51072f8d315dba05d Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:48:30 +0200 Subject: [PATCH 50/59] Delete store_full_gedGsfE.pu.tcsh --- Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh diff --git a/Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh b/Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh deleted file mode 100755 index ecbe62214718b..0000000000000 --- a/Validation/RecoEgamma/test/store_full_gedGsfE.pu.tcsh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/tcsh -./electronBsub 1nh oval run store.ValPileUpTTbarStartup_gedGsfE -./electronBsub 1nh oval run store.ValPileUpZEEStartup_gedGsfE From 5064fbe0d37496f1b8ee04638ea0a0d89e865a5e Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:48:40 +0200 Subject: [PATCH 51/59] Delete store_full_gedGsfE.su.tcsh --- Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh diff --git a/Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh b/Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh deleted file mode 100755 index bbbaf287a06c4..0000000000000 --- a/Validation/RecoEgamma/test/store_full_gedGsfE.su.tcsh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/tcsh -oval run store.ValFullPt10Startup_UP15_gedGsfE -oval run store.ValFullPt1000Startup_UP15_gedGsfE -oval run store.ValFullPt35Startup_UP15_gedGsfE -oval run store.ValFullTTbarStartup_13_gedGsfE -oval run store.ValFullZEEStartup_13_gedGsfE -oval run store.ValFullQcdPt80Pt120Startup_13_gedGsfE From 1d87ad8ad5afe2cc1dffb5dac8d910782af875d8 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:49:42 +0200 Subject: [PATCH 52/59] new store script replace store_fast_gedGsfE.tcsh, store_full_gedGsfE.pu.tcsh and store_full_gedGsfE.su.tcsh --- Validation/RecoEgamma/test/store_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/store_gedGsfE.tcsh b/Validation/RecoEgamma/test/store_gedGsfE.tcsh index 339256f80382a..3e8a8f197b744 100644 --- a/Validation/RecoEgamma/test/store_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/store_gedGsfE.tcsh @@ -27,7 +27,7 @@ then then if [ "$2" != "p" ] then - echo "pas de choix calcul" + echo "pas de choix calcul" echo "defaut = FULL" CHOIX_CALCUL='Full' else From cebb59523917ce7e82d73486a60f4326c371b3c5 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:50:32 +0200 Subject: [PATCH 53/59] New analyze script replace analyze_fast_gedGsfE.tcsh, analyze_full_gedGsfE.pu.tcsh and analyze_full_gedGsfE.su.tcsh --- Validation/RecoEgamma/test/analyze_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh b/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh index fb8e6213a01fa..0527e5057b23e 100644 --- a/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh @@ -27,7 +27,7 @@ then then if [ "$2" != "p" ] then - echo "pas de choix calcul" + echo "pas de choix calcul" echo "defaut = FULL" CHOIX_CALCUL='Full' else From 8edb5c2fa724d733b35ec25ab6e32e6300276ad8 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 12:51:22 +0200 Subject: [PATCH 54/59] new finalize script replace inalize_fast_gedGsfE.tcsh*, finalize_full_gedGsfE.su.tcsh and finalize_full_gedGsfE.pu.tcsh --- Validation/RecoEgamma/test/finalize_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh index 226a1a6344661..1256251eb0b61 100644 --- a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh @@ -27,7 +27,7 @@ then then if [ "$2" != "p" ] then - echo "pas de choix calcul" + echo "pas de choix calcul" echo "defaut = FULL" CHOIX_CALCUL='Full' else From 4cce2751b7bbcd4c236a23c32899063b82c85be2 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 14:46:15 +0200 Subject: [PATCH 55/59] Update analyze_gedGsfE.tcsh --- Validation/RecoEgamma/test/analyze_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh b/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh index 0527e5057b23e..bc4fb7d388a84 100644 --- a/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/analyze_gedGsfE.tcsh @@ -4,7 +4,7 @@ echo $1 $2 if [ "$1" == "?" ] then - echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "methode : ./analyze_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" echo "defaut = j r" exit fi From a3650b90426fc6b1a1e92581e7ac96d17fb116c0 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 14:46:38 +0200 Subject: [PATCH 56/59] Update finalize_gedGsfE.tcsh --- Validation/RecoEgamma/test/finalize_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh index 1256251eb0b61..222dbeee2f624 100644 --- a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh @@ -4,7 +4,7 @@ echo $1 $2 if [ "$1" == "?" ] then - echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "methode : ./analyze_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" echo "defaut = j r" exit fi From 821936573327f6d3a8f29e3450bd63f2b8a59403 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 14:46:59 +0200 Subject: [PATCH 57/59] Update store_gedGsfE.tcsh --- Validation/RecoEgamma/test/store_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/store_gedGsfE.tcsh b/Validation/RecoEgamma/test/store_gedGsfE.tcsh index 3e8a8f197b744..30f0916b7b921 100644 --- a/Validation/RecoEgamma/test/store_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/store_gedGsfE.tcsh @@ -4,7 +4,7 @@ echo $1 $2 if [ "$1" == "?" ] then - echo "methode : ./analyze_gedGsfE [i,j] [r,f,p]" + echo "methode : ./analyze_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" echo "defaut = j r" exit fi From f28b96980e1aa30c4e4c461fdd56de10fef8ac6b Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 17:24:07 +0200 Subject: [PATCH 58/59] Update store_gedGsfE.tcsh --- Validation/RecoEgamma/test/store_gedGsfE.tcsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Validation/RecoEgamma/test/store_gedGsfE.tcsh b/Validation/RecoEgamma/test/store_gedGsfE.tcsh index 30f0916b7b921..897f219b7c044 100644 --- a/Validation/RecoEgamma/test/store_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/store_gedGsfE.tcsh @@ -4,7 +4,7 @@ echo $1 $2 if [ "$1" == "?" ] then - echo "methode : ./analyze_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" + echo "methode : .store_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" echo "defaut = j r" exit fi @@ -59,7 +59,7 @@ PileUp) echo "PileUp" for i in TTbarStartup ZEEStartup do echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" - #${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE done ;; Fast) echo "Fast" @@ -67,7 +67,7 @@ Fast) echo "Fast" for i in TTbarStartup ZEEStartup do echo " == ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE" - #${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE + ${CHOIX_INTERACTION}${CHOIX_CALCUL}${i}_gedGsfE done ;; esac From bcb7da8beb1dd1451e6fe8f1c6bcee5698861916 Mon Sep 17 00:00:00 2001 From: Chiron Date: Tue, 8 Apr 2014 17:24:36 +0200 Subject: [PATCH 59/59] Update finalize_gedGsfE.tcsh --- Validation/RecoEgamma/test/finalize_gedGsfE.tcsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh index 222dbeee2f624..11d102e4f4ff5 100644 --- a/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh +++ b/Validation/RecoEgamma/test/finalize_gedGsfE.tcsh @@ -4,7 +4,7 @@ echo $1 $2 if [ "$1" == "?" ] then - echo "methode : ./analyze_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" + echo "methode : ./finalize_gedGsfE [i(nteractif),j(ob)] [r(eco),f(ast),p(ileup)]" echo "defaut = j r" exit fi