Merge pull request #9973 from archiron/ElectronValidationCorrections2

Electron validation corrections2
cms-sw · Jul 3, 2015 · d64f3e6 · d64f3e6
2 parents 16bad6a + 39ece62
commit d64f3e6
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 148 deletions.
diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py
diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py
@@ -22,7 +22,7 @@
   Nbinhoe = cms.int32(100), Hoemin = cms.double(0.0), Hoemax = cms.double(0.5),
   Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5),
   Nbinerror = cms.int32(30), Energyerrormax = cms.double(150.0),
-  EfficiencyFlag = cms.bool(False), StatOverflowFlag = cms.bool(False)
+  EfficiencyFlag = cms.bool(True), StatOverflowFlag = cms.bool(False)
 )
 
 electronMcSignalValidatorPt1000 = cms.EDAnalyzer("ElectronMcSignalValidator",

diff --git a/Validation/RecoEgamma/python/electronValidationSequence_cff.py b/Validation/RecoEgamma/python/electronValidationSequence_cff.py
@@ -1,8 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from Validation.RecoEgamma.electronIsoFromDeps_cff import *
-#from Validation.RecoEgamma.ElectronMcSignalValidator_cfi import *
-#from Validation.RecoEgamma.ElectronMcFakeValidator_cfi import *
 from Validation.RecoEgamma.ElectronMcSignalValidator_gedGsfElectrons_cfi import *
 from Validation.RecoEgamma.ElectronMcFakeValidator_gedGsfElectrons_cfi import *
 from Validation.RecoEgamma.ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi import *

diff --git a/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt b/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt
@@ -48,9 +48,9 @@ ElectronMcSignalValidator/h_scl_EoEtrue_barrel_new_phigap   1 1 1 0
 ElectronMcSignalValidator/h_scl_EoEtrue_ebeegap_new         1 1 1 0
 ElectronMcSignalValidator/h_scl_EoEtrue_endcaps_new         1 1 0 0
 ElectronMcSignalValidator/h_scl_EoEtrue_endcaps_new_deegap  1 1 1 0
-ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_pfx 1 1 0 0
-ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_barrel_pfx 1 1 0 0
-ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_endcaps_pfx 1 1 1 0
+ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_pfx 0 1 0 0
+ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_barrel_pfx 0 1 0 0
+ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_endcaps_pfx 0 1 1 0
 ElectronMcSignalValidator/h_scl_bcl_EtotoEtrue              1 1 0 0
 ElectronMcSignalValidator/h_scl_bcl_EtotoEtrue_barrel       1 1 0 0
 ElectronMcSignalValidator/h_scl_bcl_EtotoEtrue_endcaps      1 1 1 0

diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPt1000Validation_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPt1000Validation_cfg.py
diff --git a/Validation/RecoEgamma/test/OvalFile b/Validation/RecoEgamma/test/OvalFile
@@ -1,12 +1,12 @@
 <var name="TEST_COMMENT" value="">
-<var name="TEST_NEW" value="7_5_0_pre2_std">
-<var name="TEST_REF" value="7_5_0_pre1_std">
+<var name="TEST_NEW" value="7_5_0_pre5_std">
+<var name="TEST_REF" value="7_5_0_pre4_std">
 
-<var name="TAG_STARTUP" value="MCRUN2_74_V7">
+<var name="TAG_STARTUP" value="MCRUN2_75_V5">
 <var name="DATA_VERSION" value="v1">
 
 TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE
-<var name="DD_COND_REF" value="MCRUN2_74_V7-v1">
+<var name="DD_COND_REF" value="MCRUN2_75_V1-v1">
 
 <var name="DD_RELEASE" value="${CMSSW_VERSION}">
 
@@ -114,7 +114,6 @@ FullSim
     <!--var name="DD_COND" value="STARTUP"-->
     <environment name="ValFullPt10Startup_UP15">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt10_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -133,7 +132,6 @@ FullSim
 
     <environment name="ValFullPt35Startup_UP15">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt35_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -152,7 +150,6 @@ FullSim
 
     <environment name="ValFullPt1000Startup_UP15">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt1000_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -171,7 +168,6 @@ FullSim
 
     <environment name="ValFullTTbarStartup_13">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValTTbar_13">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -190,7 +186,6 @@ FullSim
 
     <environment name="ValFullZEEStartup_13">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValZEE_13">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -232,7 +227,6 @@ FullSim
 
     <environment name="ValFullPt10Startup_UP15_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt10_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -251,7 +245,6 @@ FullSim
 
     <environment name="ValFullPt35Startup_UP15_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt35_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -292,7 +285,6 @@ FullSim
 
     <environment name="ValFullTTbarStartup_13_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValTTbar_13">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -311,7 +303,6 @@ FullSim
 
     <environment name="ValFullZEEStartup_13_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValZEE_13">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -541,7 +532,6 @@ FullSim
 
     <environment name="ValgedvsgedFullPt10Startup_UP15_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt10_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -555,7 +545,6 @@ FullSim
 
     <environment name="ValgedvsgedFullPt35Startup_UP15_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValSingleElectronPt35_UP15">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -587,7 +576,6 @@ FullSim
 
     <environment name="ValgedvsgedFullTTbarStartup_13_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValTTbar_13">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">
@@ -601,7 +589,6 @@ FullSim
 
     <environment name="ValgedvsgedFullZEEStartup_13_gedGsfE">
 
-      <var name="VAL_ANALYZER" value="ElectronMcSignalValidator">
       <var name="DD_SAMPLE" value="RelValZEE_13">
       <!--var name="DD_SOURCE" value="/castor/cern.ch/cms/store/unmerged/dqm/${DD_SAMPLE}-${DD_RELEASE}-${DD_COND}-DQM-DQMHarvest-OfflineDQM"-->
       <var name="DD_SOURCE" value="/eos/cms/store/relval/${DD_RELEASE}/${DD_SAMPLE}/${DD_TIER}/${DD_COND}">

diff --git a/Validation/RecoEgamma/test/OvalFile.FAST b/Validation/RecoEgamma/test/OvalFile.FAST
@@ -1,12 +1,12 @@
 <var name="TEST_COMMENT" value="">
-<var name="TEST_NEW" value="7_5_0_pre2_std">
-<var name="TEST_REF" value="7_4_0_pre9_ROOT6_std">
+<var name="TEST_NEW" value="7_5_0_pre5_std">
+<var name="TEST_REF" value="7_5_0_pre4_std">
 
-<var name="TAG_STARTUP" value="MCRUN2_74_V7">
+<var name="TAG_STARTUP" value="MCRUN2_75_V5">
 <var name="DATA_VERSION" value="v1">
 
 TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE
-<var name="DD_COND_REF" value="MCRUN2_74_V7_FastSim-v1">
+<var name="DD_COND_REF" value="MCRUN2_75_V1_FastSim-v1">
 
 <var name="DD_RELEASE" value="${CMSSW_VERSION}">
 

diff --git a/Validation/RecoEgamma/test/OvalFile.GED b/Validation/RecoEgamma/test/OvalFile.GED
@@ -1,12 +1,12 @@
 <var name="TEST_COMMENT" value="">
-<var name="TEST_NEW" value="7_5_0_pre2_std">
-<var name="TEST_REF" value="7_5_0_pre1_std">
+<var name="TEST_NEW" value="7_5_0_pre5_std">
+<var name="TEST_REF" value="7_5_0_pre4_std">
 
-<var name="TAG_STARTUP" value="MCRUN2_74_V7">
+<var name="TAG_STARTUP" value="MCRUN2_75_V5">
 <var name="DATA_VERSION" value="v1">
 
 TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE
-<var name="DD_COND_REF" value="MCRUN2_74_V7-v1">
+<var name="DD_COND_REF" value="MCRUN2_75_V1-v1">
 
 <var name="DD_RELEASE" value="${CMSSW_VERSION}">
 

diff --git a/Validation/RecoEgamma/test/OvalFile.PU b/Validation/RecoEgamma/test/OvalFile.PU
@@ -1,12 +1,12 @@
 <var name="TEST_COMMENT" value="">
-<var name="TEST_NEW" value="7_5_0_pre2_std">
-<var name="TEST_REF" value="7_4_0_pre9_ROOT6_std">
+<var name="TEST_NEW" value="7_5_0_pre5_std">
+<var name="TEST_REF" value="7_5_0_pre4_std">
 
-<var name="TAG_STARTUP" value="MCRUN2_73_V6">
+<var name="TAG_STARTUP" value="MCRUN2_75_V4">
 <var name="DATA_VERSION" value="v1">
 
 TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE
-<var name="DD_COND_REF" value="PU50ns_MCRUN2_74_V6-v1">
+<var name="DD_COND_REF" value="PU50ns_MCRUN2_75_V0-v1">
 
 <var name="DD_RELEASE" value="${CMSSW_VERSION}">
 
@@ -174,7 +174,7 @@ FullSim
 
         <target name="store" cmd='electronStore.py -r ${TEST_NEW} -m "${TEST_COMMENT}" -a ${VAL_ANALYZER}/${VAL_POST_ANALYZER} -c ${VAL_CONFIGURATION}/${VAL_POST_CONFIGURATION} ${TEST_HISTOS_FILE} ${TEST_OUTPUT_LOGS} ${STORE_DIR}'>
         <target name="force" cmd='electronStore.py -f -r ${TEST_NEW} -m "${TEST_COMMENT}" -a ${VAL_ANALYZER}/${VAL_POST_ANALYZER} -c ${VAL_CONFIGURATION}/${VAL_POST_CONFIGURATION} ${TEST_HISTOS_FILE} ${TEST_OUTPUT_LOGS} ${STORE_DIR}'>
-	    <target name="publish" cmd='electronCompare.py -c ${VAL_HISTOS} -r ${RED_FILE} -b ${BLUE_FILE} -t "${TEST_NEW} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND} vs ${TEST_REF} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND_REF}" ${STORE_DIR}/${RED_FILE} ${STORE_REF}/${BLUE_FILE} ${WEB_DIR}/${TEST_NEW}/GedVsGed_${TEST_REF}/PileUp50ns_${DD_SAMPLE}_gedGsfE_Startup'>
+	    <target name="publish" cmd='electronCompare.py -c ${VAL_HISTOS} -r ${RED_FILE} -b ${BLUE_FILE} -t "${TEST_NEW} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND} vs ${TEST_REF} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND_REF}" ${STORE_DIR}/${RED_FILE} ${STORE_REF}/${BLUE_FILE} ${WEB_DIR}/${TEST_NEW}/GedvsGed_${TEST_REF}/PileUp50ns_${DD_SAMPLE}_gedGsfE_Startup'>
 
       </environment>
 
@@ -196,7 +196,7 @@ FullSim
 
       <target name="store" cmd='electronStore.py -r ${TEST_NEW} -m "${TEST_COMMENT}" -a ${VAL_ANALYZER}/${VAL_POST_ANALYZER} -c ${VAL_CONFIGURATION}/${VAL_POST_CONFIGURATION} ${TEST_HISTOS_FILE} ${TEST_OUTPUT_LOGS} ${STORE_DIR}'>
       <target name="force" cmd='electronStore.py -f -r ${TEST_NEW} -m "${TEST_COMMENT}" -a ${VAL_ANALYZER}/${VAL_POST_ANALYZER} -c ${VAL_CONFIGURATION}/${VAL_POST_CONFIGURATION} ${TEST_HISTOS_FILE} ${TEST_OUTPUT_LOGS} ${STORE_DIR}'>
-      <target name="publish" cmd='electronCompare.py -c ${VAL_HISTOS} -r ${RED_FILE} -b ${BLUE_FILE} -t "${TEST_NEW} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND} vs ${TEST_REF} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND_REF}" ${STORE_DIR}/${RED_FILE} ${STORE_REF}/${BLUE_FILE} ${WEB_DIR}/${TEST_NEW}/GedVsGed_${TEST_REF}/PileUp50ns_${DD_SAMPLE}_gedGsfE_Startup'>
+      <target name="publish" cmd='electronCompare.py -c ${VAL_HISTOS} -r ${RED_FILE} -b ${BLUE_FILE} -t "${TEST_NEW} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND} vs ${TEST_REF} / gedGsfElectrons / ${DD_SAMPLE} / ${DD_COND_REF}" ${STORE_DIR}/${RED_FILE} ${STORE_REF}/${BLUE_FILE} ${WEB_DIR}/${TEST_NEW}/GedvsGed_${TEST_REF}/PileUp50ns_${DD_SAMPLE}_gedGsfE_Startup'>
 
     </environment>