Merge pull request #2309 from nancymarinelli/egmGedValidationUpdatesF…

…or700

FastSim Fixes -- Fix the FastSim postprocessing sequence so that efficiencies are calcula...

Validation/RecoEgamma/python/photonFastSimPostProcessor_cff.py

@@ -3,16 +3,24 @@
 #from Validation.RecoEgamma.photonPostprocessing_cfi import *
 import Validation.RecoEgamma.photonPostprocessing_cfi 
 fastSimPhotonPostProcessing=Validation.RecoEgamma.photonPostprocessing_cfi.photonPostprocessing.clone()
-
 fastSimPhotonPostProcessing.batch = cms.bool(False)
 fastSimPhotonPostProcessing.standalone = cms.bool(False)
 fastSimPhotonPostProcessing.isRunCentrally = cms.bool(True)
 fastSimPhotonPostProcessing.fastSim = cms.bool(True)
 
+fastSimGEDPhotonPostProcessing=Validation.RecoEgamma.photonPostprocessing_cfi.photonPostprocessing.clone()
+fastSimGEDPhotonPostProcessing.ComponentName = cms.string('fastSimpfPhotonPostprocessing')
+fastSimGEDPhotonPostProcessing.analyzerName = cms.string('pfPhotonValidator')
+fastSimGEDPhotonPostProcessing.batch = cms.bool(False)
+fastSimGEDPhotonPostProcessing.standalone = cms.bool(False)
+fastSimGEDPhotonPostProcessing.isRunCentrally = cms.bool(True)
+fastSimGEDPhotonPostProcessing.fastSim = cms.bool(True)
+
+
 
 #from Validation.RecoEgamma.conversionPostprocessing_cfi import *
 #conversionPostprocessing.batch = cms.bool(False)
 #conversionPostprocessing.standalone = cms.bool(False)
 #conversionPostprocessing.fastSim = cms.bool(True)
 
-fastSimPhotonPostProcessor = cms.Sequence(fastSimPhotonPostProcessing)
+fastSimPhotonPostProcessor = cms.Sequence(fastSimPhotonPostProcessing*fastSimGEDPhotonPostProcessing)

Validation/RecoEgamma/test/fastSimValidation.csh

@@ -1,4 +1,5 @@
-#!/bin/csh
+#!/bin/csh -x
+##!/bin/csh
 
 #This script can be used to generate a web page to compare histograms from 
 #two input root files produced using the EDAnalyzers in RecoEgamma/Examples,
@@ -16,13 +17,14 @@
 #which can then be viewed in a web browser using validation.html.
 
 #=============BEGIN CONFIGURATION=================
-setenv TYPE Photons
+setenv TYPE GEDPhotons
+setenv ANALYZERNAME pfPhotonValidator
 setenv CMSSWver1 7_0_0
 setenv RELEASE 7_0_0
-setenv PRERELEASE pre8
+setenv PRERELEASE pre12
 
-setenv FULLGLOBALTAG START70_V2_amend-v4
-setenv FASTGLOBALTAG START70_V1_FastSim-v1
+setenv FULLGLOBALTAG POSTLS170_V1-v1
+setenv FASTGLOBALTAG START70_V5_FastSim-v1
 
 setenv RELEASE ${RELEASE}_${PRERELEASE}
 #setenv RELEASE ${RELEASE}
@@ -64,10 +66,10 @@ setenv FASTSIM ${WorkDir1}/PhotonValidationRelVal${RELEASE}_SingleGammaFlatPt10T
 
 else if ($SAMPLE == H130GGgluonfusion) then 
 
-setenv HISTOPATHNAME_Efficiencies DQMData/Run\ 1/EgammaV/Run\ summary/PhotonValidator/Efficiencies
-setenv HISTOPATHNAME_Photons DQMData/Run\ 1/EgammaV/Run\ summary/PhotonValidator/Photons
-setenv HISTOPATHNAME_Conversions DQMData/Run\ 1/EgammaV/Run\ summary/PhotonValidator/ConversionInfo
-setenv FULLSIM ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
+setenv HISTOPATHNAME_Efficiencies DQMData/Run\ 1/EgammaV/Run\ summary/${ANALYZERNAME}/Efficiencies
+setenv HISTOPATHNAME_Photons DQMData/Run\ 1/EgammaV/Run\ summary/${ANALYZERNAME}/Photons
+setenv HISTOPATHNAME_Conversions DQMData/Run\ 1/EgammaV/Run\ summary/${ANALYZERNAME}/ConversionInfo
+setenv FULLSIM ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion_13__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
 setenv FASTSIM ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${RELEASE}-${FASTGLOBALTAG}__DQM.root
 
 
@@ -126,7 +128,7 @@ cd $OUTDIR
 #The list of histograms to be compared for each TYPE can be configured below:
 
 
-if ( $TYPE == Photons ) then
+if ( $TYPE == Photons || $TYPE == GEDPhotons ) then
 
 
 cat > efficiencyForPhotons <<EOF
@@ -515,8 +517,8 @@ rm end.C
 if ( $TYPE == PixelMatchGsfElectron ) then
   setenv ANALYZER PixelMatchGsfElectronAnalyzer
   setenv CFG read_gsfElectrons
-else if ( $TYPE == Photons ) then
-  setenv ANALYZER PhotonValidator
+else if ( $TYPE == Photons || $TYPE == GEDPhotons  ) then
+  setenv ANALYZER  ${ANALYZERNAME}
   setenv CFG PhotonValidator_cfg
 endif
 

Validation/RecoEgamma/test/pfValidation.csh

@@ -20,13 +20,18 @@
 setenv ANALYZERNAME1 PhotonValidator
 setenv ANALYZERNAME2 pfPhotonValidator
 #setenv TYPE GEDPhotons
-setenv TYPE fullGEDPhotons
+setenv TYPE GEDPhotons
 setenv COMPAREWITH Photons
 setenv CMSSWver1 7_0_0
 setenv RELEASE   7_0_0
-setenv PRERELEASE pre9
-setenv FULLGLOBALTAG START70_V2_gedEG-v2
+setenv PRERELEASE pre11
+setenv LHCENERGY   13
+setenv UPGRADE True
+setenv PU True
+setenv PUlevel 25ns
 
+#setenv FULLGLOBALTAG POSTLS162_V4_OldEG-v1
+setenv FULLGLOBALTAG PU${PUlevel}_POSTLS162_V4-v1
 
 setenv RELEASE ${RELEASE}_${PRERELEASE}
 #setenv RELEASE ${RELEASE}
@@ -66,7 +71,7 @@ setenv SAMPLE H130GGgluonfusion
 
 if ($SAMPLE == SingleGammaPt10) then
 
-setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__RelValSingleGammaPt10__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
+setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__RelValSingleGammaPt10_UP15__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
 
 
 else if ($SAMPLE == SingleGammaPt35) then 
@@ -76,10 +81,12 @@ setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__RelValSingleGammaPt35__CMSSW_$
 
 else if ($SAMPLE == H130GGgluonfusion) then 
 
-setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
+setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion_${LHCENERGY}__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
+#setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
 #setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO_2K.root
 
 
+
 else if ($SAMPLE == PhotonJets_Pt_10) then
 
 setenv ROOTFILE ${WorkDir1}/DQM_V0001_R000000001__PhotonJets_Pt_10__CMSSW_${RELEASE}-${FULLGLOBALTAG}__DQM.root
@@ -98,6 +105,10 @@ endif
 setenv CURRENTDIR $PWD
 setenv OUTPATH /afs/cern.ch/cms/Physics/egamma/www/validation
 cd $OUTPATH
+
+#setenv RELEASE {$RELEASE}_OldEG
+#setenv RELEASE {$RELEASE}_OldTrk
+
 if (! -d $RELEASE) then
   mkdir $RELEASE
 endif
@@ -115,7 +126,15 @@ if (! -d vs${COMPAREWITH} ) then
 endif
 setenv OUTPATH $OUTPATH/vs${COMPAREWITH}
 
+
+if ( $UPGRADE == True && $PU == False ) then
+setenv OUTDIR $OUTPATH/${SAMPLE}_${LHCENERGY}TeV
+else if ( $UPGRADE == True && $PU == True ) then
+setenv OUTDIR $OUTPATH/${SAMPLE}_${LHCENERGY}TeV_PU${PUlevel}
+else 
 setenv OUTDIR $OUTPATH/${SAMPLE}
+endif
+
 if (! -d $OUTDIR) then
   cd $OUTPATH
   mkdir $OUTDIR

Validation/RecoEgamma/test/validation.csh

@@ -20,31 +20,35 @@
 setenv RUNTYPE Central
 #setenv RUNTYPE Local
 setenv STARTUP True
-setenv FASTSIM True
-setenv UPGRADE False
+setenv FASTSIM False
+setenv UPGRADE True
 ## TYPE options: Photons, GEDPhotons
 ## ANALYZERNAME options: PhotonValidator, oldpfPhotonValidator, pfPhotonValidator
-setenv TYPE Photons
-setenv ANALYZERNAME PhotonValidator
-#setenv TYPE GEDPhotons
-#setenv ANALYZERNAME pfPhotonValidator
+#setenv TYPE Photons
+#setenv ANALYZERNAME PhotonValidator
+setenv TYPE GEDPhotons
+setenv ANALYZERNAME pfPhotonValidator
 
 
 setenv CMSSWver1 7_0_0
 setenv CMSSWver2 7_0_0
 setenv OLDRELEASE 7_0_0
 setenv NEWRELEASE 7_0_0
-setenv OLDPRERELEASE pre8
-setenv NEWPRERELEASE pre9
+setenv OLDPRERELEASE pre11
+setenv NEWPRERELEASE pre12
 setenv UPGRADEVER  UPG2017
-setenv LHCENERGY   14
-
-
-if ( $STARTUP == True &&  $FASTSIM == False) then
-setenv OLDGLOBALTAG PU_START70_V2_amend-v4
-setenv NEWGLOBALTAG PU_START70_V2-v4
+setenv LHCENERGY   13
+setenv PU True
+setenv PUlevel 25ns
+
+if ( $STARTUP == True &&  $FASTSIM == False && $PU == False && $UPGRADE == True ) then
+setenv OLDGLOBALTAG POSTLS162_V4-v1
+setenv NEWGLOBALTAG POSTLS170_V1-v1
+else if ( $UPGRADE == True && $PU == True &&  $FASTSIM == False ) then
+setenv OLDGLOBALTAG PU${PUlevel}_POSTLS162_V4-v1
+setenv NEWGLOBALTAG PU${PUlevel}_POSTLS170_V1-v1
 else if (  $STARTUP == True  && $FASTSIM == True) then
-setenv OLDGLOBALTAG START70_V2_amend_FastSim-v6 
+setenv OLDGLOBALTAG START70_V2_amend_FastSim
 setenv NEWGLOBALTAG START70_V2_FastSim-v4
  endif
 
@@ -70,7 +74,7 @@ setenv WorkDir2   /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver
 
 #Name of sample (affects output directory name and htmldescription only) 
 
-setenv PU True
+
 #setenv SAMPLE SingleGammaPt10
 #setenv SAMPLE SingleGammaPt35
 ##setenv SAMPLE SingleGammaFlatPt10_100
@@ -106,11 +110,12 @@ if ( $RUNTYPE == Local ) then
 setenv OLDFILE ${WorkDir1}/PhotonValidationRelVal${OLDRELEASE}_SingleGammaPt10.root
 setenv NEWFILE ${WorkDir2}/PhotonValidationRelVal${NEWRELEASE}_SingleGammaPt10.root
 else if ( $RUNTYPE == Central ) then
-setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValSingleGammaPt10__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root
+setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValSingleGammaPt10_UP15__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root
 if ( $UPGRADE == True ) then
-setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt10_${UPGRADEVER}__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
+setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt10_UP15__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
+#setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt10_${UPGRADEVER}__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
 else 
-setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt10__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
+setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt10_UP15__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
 endif
 endif
 
@@ -149,10 +154,13 @@ setenv NEWFILE ${WorkDir2}/PhotonValidationRelVal${NEWRELEASE}_H130GGgluonfusion
 else if ( $RUNTYPE == Central ) then
 
 #setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__GEN-SIM-DIGI-RECO.root
-setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root
+#setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root
 #setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion_${UPGRADEVER}_${LHCENERGY}__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root
+
 if ( $UPGRADE == True ) then
-setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValH130GGgluonfusion_${UPGRADEVER}_${LHCENERGY}__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
+
+setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValH130GGgluonfusion_${LHCENERGY}__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root
+setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValH130GGgluonfusion_${LHCENERGY}__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
 else
 setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValH130GGgluonfusion__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root
 endif
@@ -196,6 +204,9 @@ endif
 setenv CURRENTDIR $PWD
 setenv OUTPATH /afs/cern.ch/cms/Physics/egamma/www/validation
 cd $OUTPATH
+setenv NEWRELEASE {$NEWRELEASE}
+setenv OLDRELEASE {$OLDRELEASE}
+
 if (! -d $NEWRELEASE) then
   mkdir $NEWRELEASE
 endif
@@ -216,10 +227,12 @@ setenv OUTPATH $OUTPATH/vs${OLDRELEASE}
 
 if ( $FASTSIM == True) then 
 setenv OUTDIR $OUTPATH/${SAMPLE}FastSim
-else if ( $FASTSIM == False && $PU == True ) then 
+else if ( $FASTSIM == False && $UPGRADE == False && $PU == True ) then 
 setenv OUTDIR $OUTPATH/${SAMPLE}PU
 else if ( $FASTSIM == False && $PU == False && $UPGRADE == False ) then 
 setenv OUTDIR $OUTPATH/${SAMPLE}
+else if ( $SAMPLE == H130GGgluonfusion  && $UPGRADE == True && $PU == True ) then
+setenv OUTDIR $OUTPATH/${SAMPLE}_${LHCENERGY}TeV_PU${PUlevel}
 else if ( $SAMPLE == H130GGgluonfusion  && $UPGRADE == True ) then
 setenv OUTDIR $OUTPATH/${SAMPLE}_${LHCENERGY}TeV
 else if ( $SAMPLE ==  PhotonJets_Pt_10  && $UPGRADE == True ) then
@@ -404,6 +417,18 @@ cat > scaledhistosGEDspecific <<EOF
   pfMVAEndcap
   nCluOutMustacheBarrel
   nCluOutMustacheEndcap
+  SumPtOverPhoPt_Pho_unCleanedBarrel
+  SumPtOverPhoPt_Pho_unCleanedEndcap
+  SumPtOverPhoPt_Pho_CleanedBarrel
+  SumPtOverPhoPt_Pho_CleanedEndcap
+  SumPtOverPhoPt_ChHad_unCleanedBarrel
+  SumPtOverPhoPt_ChHad_unCleanedEndcap
+  SumPtOverPhoPt_ChHad_CleanedBarrel
+  SumPtOverPhoPt_ChHad_CleanedEndcap
+  SumPtOverPhoPt_NeuHad_unCleanedBarrel
+  SumPtOverPhoPt_NeuHad_unCleanedEndcap
+  SumPtOverPhoPt_NeuHad_CleanedBarrel
+  SumPtOverPhoPt_NeuHad_CleanedEndcap
 EOF
 
 
@@ -522,11 +547,6 @@ hTkPtPullBarrel
 hTkPtPullEndcap
 hDPhiTracksAtVtxAll
 hDCotTracksAll
-hDEtaTracksAtEcalAll
-hDPhiTracksAtEcalAll
-eBcOverTkPoutAll
-eBcOverTkPoutBarrel
-eBcOverTkPoutEndcap
 zPVFromTracksAll
 zPVFromTracksBarrel
 zPVFromTracksEndcap
@@ -543,8 +563,6 @@ pChi2VsEtaAll
 pChi2VsRAll
 pDCotTracksVsEtaAll
 pDCotTracksVsRAll
-pDPhiTracksAtEcalVsEtaAll
-pDPhiTracksAtEcalVsRAll
 pdzPVVsR
 
 
@@ -1212,7 +1230,7 @@ end
 
 
 
-if ($ANALYZERNAME == pfPhotonValidator)  goto skippingHistosForTracks
+###if ($ANALYZERNAME == pfPhotonValidator)  goto skippingHistosForTracks
 foreach i (`cat scaledhistosForTracks`)
   cat > temp$N.C <<EOF
 TCanvas *c$i = new TCanvas("c$i");
@@ -1301,8 +1319,8 @@ EOF
   setenv N `expr $N + 1`
 end
 
-skippingHistosForTracks:
-  echo "Skipping histograms which are not defined for pfPhotons"
+#skippingHistosForTracks:
+#  echo "Skipping histograms which are not defined for pfPhotons"
 
 
 
@@ -1335,6 +1353,8 @@ else if ( $PU == False && $FASTSIM == True) then
 setenv SAMPLE ${SAMPLE}FastSim
 else if ( $SAMPLE == H130GGgluonfusion && $UPGRADE == True ) then
 setenv SAMPLE ${SAMPLE}_${LHCENERGY}TeV
+else if ( $SAMPLE == H130GGgluonfusion && $UPGRADE == True &&  $PU == True ) then
+setenv SAMPLE ${SAMPLE}_${LHCENERGY}TeV_PU${PUlevel}
 endif