diff --git a/[refs] b/[refs] index 526c5a1b9d8fb..0b9a2bc4ac674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/vhbbHeppy74X: bf43660fabd1ed4349acf63a92004b1d58f93451 +refs/heads/vhbbHeppy74X: 2622d68bf0f0c58cacf0e195c4dc5005c04e459f diff --git a/trunk/Validation/RecoEgamma/test/tkConvValidation.csh b/trunk/Validation/RecoEgamma/test/tkConvValidation.csh index a5cef6cd2739b..3f3e3f4ab3e0d 100755 --- a/trunk/Validation/RecoEgamma/test/tkConvValidation.csh +++ b/trunk/Validation/RecoEgamma/test/tkConvValidation.csh @@ -21,11 +21,11 @@ setenv RUNTYPE Central setenv STARTUP True setenv UPGRADE True -setenv CMSSWver1 6_2_0 +setenv CMSSWver1 6_1_2 setenv CMSSWver2 6_1_2 -setenv OLDRELEASE 6_2_0 +setenv OLDRELEASE 6_1_2 setenv NEWRELEASE 6_1_2 -setenv OLDPRERELEASE pre5 +setenv OLDPRERELEASE setenv NEWPRERELEASE SLHC1 setenv UPGRADEVER UPG2017 setenv LHCENERGY 14 @@ -43,19 +43,19 @@ 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}/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}_${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}/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/trunk/Validation/RecoEgamma/test/validation.csh b/trunk/Validation/RecoEgamma/test/validation.csh index fbe7c83bcda84..5b13c37a4097b 100755 --- a/trunk/Validation/RecoEgamma/test/validation.csh +++ b/trunk/Validation/RecoEgamma/test/validation.csh @@ -23,14 +23,14 @@ setenv STARTUP True setenv FASTSIM False setenv UPGRADE True -setenv CMSSWver1 6_2_0 +setenv CMSSWver1 6_1_2 setenv CMSSWver2 6_1_2 -setenv OLDRELEASE 6_2_0 +setenv OLDRELEASE 6_1_2 setenv NEWRELEASE 6_1_2 -setenv OLDPRERELEASE pre5 +setenv OLDPRERELEASE setenv NEWPRERELEASE SLHC1 setenv UPGRADEVER UPG2017 -setenv LHCENERGY 14 +setenv LHCENERGY 8 if ( $STARTUP == True && $FASTSIM == False) then @@ -44,17 +44,17 @@ 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 @@ -64,10 +64,10 @@ 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 False -setenv SAMPLE SingleGammaPt10 +#setenv SAMPLE SingleGammaPt10 #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