diff --git a/Validation/RecoEgamma/test/fastSimValidation.csh b/Validation/RecoEgamma/test/fastSimValidation.csh index 96948747787d1..3a2c3b33ad73e 100755 --- a/Validation/RecoEgamma/test/fastSimValidation.csh +++ b/Validation/RecoEgamma/test/fastSimValidation.csh @@ -17,12 +17,12 @@ #=============BEGIN CONFIGURATION================= setenv TYPE Photons -setenv CMSSWver1 6_2_0 -setenv RELEASE 6_2_0 -setenv PRERELEASE pre6_patch1 +setenv CMSSWver1 7_0_0 +setenv RELEASE 7_0_0 +setenv PRERELEASE pre1 -setenv FULLGLOBALTAG PRE_ST62_V6-v1 -setenv FASTGLOBALTAG PRE_ST62_V6_FastSim-v1 +setenv FULLGLOBALTAG PRE_ST62_V8-v1 +setenv FASTGLOBALTAG PRE_ST62_V8_FastSim-v1 setenv RELEASE ${RELEASE}_${PRERELEASE} #setenv RELEASE ${RELEASE} @@ -232,10 +232,8 @@ EOF cat > unscaledhistosForPhotons < 2dhistosForPhotons < temp$N.C <SetFillColor(10); -file_old->cd("$HISTOPATHNAME_Photons"); -$i->SetStats(0); -$i->SetMinimum(0.); -$i->SetMarkerColor(kPink+8); -$i->SetMarkerStyle(2); -$i->SetMarkerSize(0.2); -$i->Draw(); -file_new->cd("$HISTOPATHNAME_Photons"); -$i->SetStats(0); -$i->SetMarkerColor(kBlack); -$i->SetMarkerStyle(2); -$i->SetMarkerSize(0.2); -$i->Draw("same"); -c$i->SaveAs("gifs/$i.gif"); - -EOF - setenv N `expr $N + 1` -end - setenv NTOT `expr $N - 1` setenv N 1 @@ -609,7 +563,6 @@ rm validationPlotsTemplate.html rm scaledhistosForPhotons rm unscaledhistosForPhotons -rm 2dhistosForPhotons rm efficiencyForPhotons rm scaledhistosForPhotonsLogScale diff --git a/Validation/RecoEgamma/test/tkConvValidation.csh b/Validation/RecoEgamma/test/tkConvValidation.csh index 3f3e3f4ab3e0d..99b7495932817 100755 --- a/Validation/RecoEgamma/test/tkConvValidation.csh +++ b/Validation/RecoEgamma/test/tkConvValidation.csh @@ -19,22 +19,22 @@ setenv TYPE AllConversions setenv RUNTYPE Central setenv STARTUP True -setenv UPGRADE True - -setenv CMSSWver1 6_1_2 -setenv CMSSWver2 6_1_2 -setenv OLDRELEASE 6_1_2 -setenv NEWRELEASE 6_1_2 -setenv OLDPRERELEASE -setenv NEWPRERELEASE SLHC1 +setenv UPGRADE False + +setenv CMSSWver1 6_2_0 +setenv CMSSWver2 6_2_0 +setenv OLDRELEASE 6_2_0 +setenv NEWRELEASE 6_2_0 +setenv OLDPRERELEASE pre8 +setenv NEWPRERELEASE setenv UPGRADEVER UPG2017 setenv LHCENERGY 14 if ( $STARTUP == True) then -setenv OLDGLOBALTAG PRE_ST61_V1-v1 -setenv NEWGLOBALTAG PRE_PO61_V1-v1 +setenv OLDGLOBALTAG PRE_ST62_V8-v1 +setenv NEWGLOBALTAG PRE_ST62_V8-v3 else setenv OLDGLOBALTAG START50_V8-v3 setenv NEWGLOBALTAG START50_V8-v3 @@ -43,16 +43,16 @@ endif -#setenv OLDRELEASE ${OLDRELEASE}_${OLDPRERELEASE} -setenv OLDRELEASE ${OLDRELEASE} -setenv NEWRELEASE ${NEWRELEASE}_${NEWPRERELEASE} -#setenv NEWRELEASE ${NEWRELEASE} +setenv OLDRELEASE ${OLDRELEASE}_${OLDPRERELEASE} +#setenv OLDRELEASE ${OLDRELEASE} +#setenv NEWRELEASE ${NEWRELEASE}_${NEWPRERELEASE} +setenv NEWRELEASE ${NEWRELEASE} -setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}/src/Validation/RecoEgamma/test -setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}_${NEWPRERELEASE}/src/Validation/RecoEgamma/test +#setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}/src/Validation/RecoEgamma/test +#setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}_${NEWPRERELEASE}/src/Validation/RecoEgamma/test -#setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}_${OLDPRERELEASE}/src/Validation/RecoEgamma/test -#setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}/src/Validation/RecoEgamma/test +setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}_${OLDPRERELEASE}/src/Validation/RecoEgamma/test +setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}/src/Validation/RecoEgamma/test #setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}_${OLDPRERELEASE}/src/Validation/RecoEgamma/test #setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}_${NEWPRERELEASE}/src/Validation/RecoEgamma/test @@ -67,8 +67,8 @@ setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver setenv PU False #setenv SAMPLE SingleGammaPt10 -setenv SAMPLE SingleGammaPt35 -#setenv SAMPLE QCD_Pt_80_120 +#setenv SAMPLE SingleGammaPt35 +setenv SAMPLE QCD_Pt_80_120 #setenv SAMPLE QCD_Pt_20_30 #setenv SAMPLE H130GGgluonfusion diff --git a/Validation/RecoEgamma/test/validation.csh b/Validation/RecoEgamma/test/validation.csh index a6a1ed317dc52..3f8b73d9c8734 100755 --- a/Validation/RecoEgamma/test/validation.csh +++ b/Validation/RecoEgamma/test/validation.csh @@ -23,42 +23,44 @@ setenv STARTUP True setenv FASTSIM False setenv UPGRADE False ## TYPE options: Photons, GEDPhotons -setenv TYPE Photons +#setenv TYPE Photons +setenv TYPE GEDPhotons ## ANALYZERNAME options: PhotonValidator, oldpfPhotonValidator, pfPhotonValidator -setenv ANALYZERNAME PhotonValidator +#setenv ANALYZERNAME PhotonValidator +setenv ANALYZERNAME pfPhotonValidator setenv CMSSWver1 6_2_0 -setenv CMSSWver2 6_2_0 +setenv CMSSWver2 7_0_0 setenv OLDRELEASE 6_2_0 -setenv NEWRELEASE 6_2_0 -setenv OLDPRERELEASE pre5 -setenv NEWPRERELEASE pre6_patch1 +setenv NEWRELEASE 7_0_0 +setenv OLDPRERELEASE +setenv NEWPRERELEASE pre1 setenv UPGRADEVER UPG2017 setenv LHCENERGY 14 if ( $STARTUP == True && $FASTSIM == False) then -setenv OLDGLOBALTAG PRE_ST61_V1-v1 -setenv NEWGLOBALTAG PRE_ST62_V6-v1 +setenv OLDGLOBALTAG PRE_ST62_V8-v3 +setenv NEWGLOBALTAG PRE_ST62_V8-v1 else if ( $STARTUP == True && $FASTSIM == True) then -setenv OLDGLOBALTAG START61_V11_FastSim-v1 -setenv NEWGLOBALTAG PRE_ST61_V1_FastSim-v1 +setenv OLDGLOBALTAG PRE_ST62_V8_FastSim-v3 +setenv NEWGLOBALTAG PRE_ST62_V8_FastSim-v1 endif -setenv OLDRELEASE ${OLDRELEASE}_${OLDPRERELEASE} -#setenv OLDRELEASE ${OLDRELEASE} +#setenv OLDRELEASE ${OLDRELEASE}_${OLDPRERELEASE} +setenv OLDRELEASE ${OLDRELEASE} setenv NEWRELEASE ${NEWRELEASE}_${NEWPRERELEASE} #setenv NEWRELEASE ${NEWRELEASE} -#setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}/src/Validation/RecoEgamma/test -#setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}_${NEWPRERELEASE}/src/Validation/RecoEgamma/test - -setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}_${OLDPRERELEASE}/src/Validation/RecoEgamma/test +setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}/src/Validation/RecoEgamma/test setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}_${NEWPRERELEASE}/src/Validation/RecoEgamma/test +#setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}_${OLDPRERELEASE}/src/Validation/RecoEgamma/test +#setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}_${NEWPRERELEASE}/src/Validation/RecoEgamma/test + #setenv WorkDir1 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver1}_${OLDPRERELEASE}/src/Validation/RecoEgamma/test #setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver2}/src/Validation/RecoEgamma/test @@ -69,9 +71,9 @@ setenv WorkDir2 /afs/cern.ch/user/n/nancy/scratch0/CMSSW/test/CMSSW_${CMSSWver setenv PU False #setenv SAMPLE SingleGammaPt10 -#setenv SAMPLE SingleGammaPt35 +setenv SAMPLE SingleGammaPt35 ##setenv SAMPLE SingleGammaFlatPt10_100 -setenv SAMPLE H130GGgluonfusion +#setenv SAMPLE H130GGgluonfusion #setenv SAMPLE PhotonJets_Pt_10 #setenv SAMPLE GammaJets_Pt_80_120 #setenv SAMPLE QCD_Pt_80_120 @@ -353,12 +355,6 @@ EOF cat > unscaledhistosForPhotons < 2dhistosForPhotons < efficiencyForConvertedPhotons < temp$N.C <SetFillColor(10); -//file_old->cd("DQMData/EgammaV/${ANALYZERNAME}/Photons"); -file_old->cd("$HISTOPATHNAME_Photons"); -$i->SetStats(0); -$i->SetMinimum(0.); -$i->SetMarkerColor(kPink+8); -$i->SetMarkerStyle(2); -$i->SetMarkerSize(0.2); -$i->Draw(); -//file_new->cd("DQMData/EgammaV/${ANALYZERNAME}/Photons"); -file_new->cd("$HISTOPATHNAME_Photons"); -$i->SetStats(0); -$i->SetMarkerColor(kBlack); -$i->SetMarkerStyle(2); -$i->SetMarkerSize(0.2); -$i->Draw("same"); -c$i->SaveAs("gifs/$i.gif"); - -EOF - setenv N `expr $N + 1` -end - - - foreach i (`cat efficiencyForConvertedPhotons`) cat > temp$N.C < temp$N.C < temp$N.C < - -
Reconstructed photon matching a simulated photon: ratio between e3x3 and super cluster energy -as a function of &eta - - - - -
Reconstructed photon matching a simulated photon: ratio between e3x3 and super cluster energy -as a function of photon Et - - -
Reconstructed photon matching a simulated photon: ratio between e3x3 and super cluster energy The distribution is for ecal barrel only. @@ -238,104 +224,8 @@ - - - - - - -
- -
Reconstructed photon matching a simulated photon: -Super Cluster energy resolution defined as the ratio between reconstructed and simulated energy vs R9 - -
- -
Reconstructed photon matching a simulated photon: -Super Cluster energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Barrel only - -
- -
Reconstructed photon matching a simulated photon: -Super Cluster energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Endcap only - -
- - - - - - - -
- -
Reconstructed photon matching a simulated photon: -Super Cluster energy resolution defined as the ratio between reconstructed and simulated energy vs R9 - -
- -
Reconstructed photon matching a simulated photon: -Super Cluster energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Barrel only - -
- -
Reconstructed photon matching a simulated photon: -Super Cluster energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Endcap only - -
- - - - - - - -
- -
Reconstructed photon matching a simulated photon: -Photon energy resolution defined as the ratio between reconstructed and simulated energy vs R9 - -
- -
Reconstructed photon matching a simulated photon: -Photon energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Barrel only - -
- -
Reconstructed photon matching a simulated photon: -Photon energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Endcap only - -
- - - - -
- -
Reconstructed photon matching a simulated photon: -Photon energy resolution defined as the ratio between reconstructed and simulated energy vs R9 - -
- -
Reconstructed photon matching a simulated photon: -Photon energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Barrel only - -
- -
Reconstructed photon matching a simulated photon: -Photon energy resolution defined as the ratio between reconstructed and simulated energy vs R9 -for Endcap only - -
@@ -398,16 +288,6 @@
- -
- -
Reconstructed photon matching a simulated photon: e1x5/e5x5 ratio as a function of &eta - -
- -
Reconstructed photon matching a simulated photon: e1x5/e5x5 ratio as a function of photon et - -

Reconstructed photon matching a simulated photon: e1x5/e5x5 The distribution is for ecal barrel only. @@ -438,18 +318,6 @@ - -
- -
Reconstructed photon matching a simulated photon: e2x5/e5x5 ratio -as a function of &eta - -
- -
Reconstructed photon matching a simulated photon: e2x5/e5x5 ratio -as a function of photon Et - -

Reconstructed photon matching a simulated photon: e2x5/e5x5 ratio The distribution is for ecal barrel only. @@ -480,18 +348,6 @@ - -
- -
Reconstructed photon matching a simulated photon: sigmaIetaIeta -as a function of &eta - -
- -
Reconstructed photon matching a simulated photon: sigmaIetaIeta -as a function of photon Et - -

Reconstructed photon matching a simulated photon: sigmaIetaIeta The distribution is for ecal barrel only. @@ -751,18 +607,6 @@ - -
- -
Reconstructed photon matching a simulated photon: track Pt sum in SolidConeDR04 -as a function of &eta - -
- -
Reconstructed photon matching a simulated photon: track Pt sum in SolidConeDR04 -as a function of photon Et - -

Reconstructed photon matching a simulated photon: track Pt sum in SolidConeDR04 The distribution is obtained for |&eta| < 2.5 @@ -786,18 +630,6 @@ - -
- -
Reconstructed photon matching a simulated photon: number of tracks in SolidConeDR04 -as a function of &eta - -
- -
Reconstructed photon matching a simulated photon: number of tracks in SolidConeDR04 -as a function of photon Et - -

Reconstructed photon matching a simulated photon: number of tracks in SolidConeDR04 The distribution is obtained for |&eta| < 2.5