Skip to content

Commit

Permalink
Merge pull request #690 from nancymarinelli/700UpdatesInValidationRec…
Browse files Browse the repository at this point in the history 
…oEgamma_test

700 updates in validation reco egamma test
  • Loading branch information
@davidlt
davidlt committed Sep 8, 2013
2 parents 8045748 + dba6570 commit 2b84258
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 313 deletions.
57 changes: 5 additions & 52 deletions Validation/RecoEgamma/test/fastSimValidation.csh
View file
Expand Up @@ -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}
Expand Down Expand Up @@ -232,10 +232,8 @@ EOF


cat > unscaledhistosForPhotons <<EOF
pEResVsR9All
pEResVsR9Barrel
pEResVsR9Endcap
scpEResVsR9All
scpEResVsR9Barrel
scpEResVsR9Endcap
pEResVsEtAll
Expand Down Expand Up @@ -263,27 +261,6 @@ EOF



cat > 2dhistosForPhotons <<EOF
R9VsEtaAll
R1VsEtaAll
R2VsEtaAll
sigmaIetaIetaVsEtaAll
isoTrkSolidConeDR04VsEtaAll
nTrkSolidConeDR04VsEtaAll
R9VsEtAll
R1VsEtAll
R2VsEtAll
sigmaIetaIetaVsEtAll
isoTrkSolidConeDR04VsEtAll
nTrkSolidConeDR04VsEtAll
eResVsR9All
eResVsR9Barrel
eResVsR9Endcap
sceResVsR9All
sceResVsR9Barrel
sceResVsR9Endcap
EOF



Expand Down Expand Up @@ -519,29 +496,6 @@ end



foreach i (`cat 2dhistosForPhotons`)
cat > temp$N.C <<EOF
TCanvas *c$i = new TCanvas("c$i");
c$i->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
Expand Down Expand Up @@ -609,7 +563,6 @@ rm validationPlotsTemplate.html

rm scaledhistosForPhotons
rm unscaledhistosForPhotons
rm 2dhistosForPhotons
rm efficiencyForPhotons
rm scaledhistosForPhotonsLogScale

Expand Down
40 changes: 20 additions & 20 deletions Validation/RecoEgamma/test/tkConvValidation.csh
View file
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
98 changes: 25 additions & 73 deletions Validation/RecoEgamma/test/validation.csh
View file
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -353,12 +355,6 @@ EOF


cat > unscaledhistosForPhotons <<EOF
pEResVsR9All
pEResVsR9Barrel
pEResVsR9Endcap
scpEResVsR9All
scpEResVsR9Barrel
scpEResVsR9Endcap
pEResVsEtAll
pEResVsEtBarrel
pEResVsEtEndcap
Expand All @@ -384,25 +380,6 @@ EOF



cat > 2dhistosForPhotons <<EOF
R9VsEtaAll
R1VsEtaAll
R2VsEtaAll
R9VsEtAll
R1VsEtAll
R2VsEtAll
sigmaIetaIetaVsEtAll
isoTrkSolidConeDR04VsEtAll
nTrkSolidConeDR04VsEtAll
eResVsR9All
eResVsR9Barrel
eResVsR9Endcap
sceResVsR9All
sceResVsR9Barrel
sceResVsR9Endcap
EOF



cat > efficiencyForConvertedPhotons <<EOF
Expand Down Expand Up @@ -799,33 +776,6 @@ end



foreach i (`cat 2dhistosForPhotons`)
cat > temp$N.C <<EOF
TCanvas *c$i = new TCanvas("c$i");
c$i->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 <<EOF
TCanvas *c$i = new TCanvas("c$i");
Expand Down Expand Up @@ -1103,7 +1053,7 @@ end




if ($ANALYZERNAME == pfPhotonValidator) goto skippingHistosForTracks
foreach i (`cat scaledhistosForTracks`)
cat > temp$N.C <<EOF
TCanvas *c$i = new TCanvas("c$i");
Expand Down Expand Up @@ -1142,6 +1092,8 @@ EOF
setenv N `expr $N + 1`
end



foreach i (`cat unscaledhistosForTracks`)
cat > temp$N.C <<EOF
TCanvas *c$i = new TCanvas("c$i");
Expand Down Expand Up @@ -1190,7 +1142,8 @@ EOF
setenv N `expr $N + 1`
end


skippingHistosForTracks:
echo "Skipping histograms which are not defined for pfPhotons"



Expand Down Expand Up @@ -1266,7 +1219,6 @@ rm validationPlotsTemplate.html

rm scaledhistosForPhotons
rm unscaledhistosForPhotons
rm 2dhistosForPhotons
rm scaledhistosForConvertedPhotons
rm scaledhistosForConvertedPhotonsLogScale
rm unscaledhistosForConvertedPhotons
Expand Down

0 comments on commit 2b84258

Please sign in to comment.