diff --git a/[refs] b/[refs] index 2cccd0f0442c5..95d0087587860 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/l1t-devel-CMSSW_7_4_0_pre5: 241ad6c3df32b76271690119ba4cd68108d7672d +refs/heads/l1t-devel-CMSSW_7_4_0_pre5: 71ab736636ef336e210bfcb27fcbc495aa7cc194 diff --git a/trunk/Validation/RecoEgamma/test/validation.csh b/trunk/Validation/RecoEgamma/test/validation.csh index 3d8083c769ab6..8b3f55989a47d 100755 --- a/trunk/Validation/RecoEgamma/test/validation.csh +++ b/trunk/Validation/RecoEgamma/test/validation.csh @@ -20,23 +20,23 @@ setenv TYPE Photons setenv RUNTYPE Central #setenv RUNTYPE Local -setenv STARTUP False +setenv STARTUP True -setenv CMSSWver1 4_2_0 -setenv CMSSWver2 4_2_2 -setenv OLDRELEASE 4_2_0 -setenv NEWRELEASE 4_2_2 +setenv CMSSWver1 4_2_2 +setenv CMSSWver2 4_2_8 +setenv OLDRELEASE 4_2_2 +setenv NEWRELEASE 4_2_8 setenv OLDPRERELEASE setenv NEWPRERELEASE if ( $STARTUP == True) then -setenv OLDGLOBALTAG START42_V9-v1 -setenv NEWGLOBALTAG START42_V11-v1 +setenv OLDGLOBALTAG START42_V11-v1 +setenv NEWGLOBALTAG START42_V12-v1 else -setenv OLDGLOBALTAG MC_42_V9-v1 -setenv NEWGLOBALTAG MC_42_V11-v1 +setenv OLDGLOBALTAG MC_42_V11-v1 +setenv NEWGLOBALTAG MC_42_V12-v1 endif @@ -53,7 +53,7 @@ setenv NEWRELEASE ${NEWRELEASE} #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 @@ -63,10 +63,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 SAMPLE SingleGammaPt10IDEAL -setenv SAMPLE SingleGammaPt35IDEAL +#setenv SAMPLE SingleGammaPt35IDEAL #setenv SAMPLE SingleGammaFlatPt10_100 #setenv SAMPLE H130GGgluonfusionSTARTUP -#setenv SAMPLE PhotonJets_Pt_10STARTUP +setenv SAMPLE PhotonJets_Pt_10STARTUP #setenv SAMPLE GammaJets_Pt_80_120STARTUP #setenv SAMPLE QCD_Pt_80_120STARTUP @@ -98,7 +98,7 @@ setenv OLDFILE ${WorkDir1}/PhotonValidationRelVal${OLDRELEASE}_SingleGammaPt10.r 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 NEWFILE ${WorkDir2}/DQM_V0002_R000000001__RelValSingleGammaPt10__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root +setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt10__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root endif @@ -111,7 +111,7 @@ setenv NEWFILE ${WorkDir2}/PhotonValidationRelVal${NEWRELEASE}_SingleGammaPt35.r else if ( $RUNTYPE == Central ) then -setenv OLDFILE ${WorkDir1}/DQM_V0003_R000000001__RelValSingleGammaPt35__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root +setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValSingleGammaPt35__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValSingleGammaPt35__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root endif @@ -150,7 +150,7 @@ setenv NEWFILE ${WorkDir2}/PhotonValidationRelVal${NEWRELEASE}_PhotonJets_Pt_10. else if ( $RUNTYPE == Central ) then setenv OLDFILE ${WorkDir1}/DQM_V0001_R000000001__RelValPhotonJets_Pt_10__CMSSW_${OLDRELEASE}-${OLDGLOBALTAG}__DQM.root -setenv NEWFILE ${WorkDir2}/DQM_V0002_R000000001__RelValPhotonJets_Pt_10__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root +setenv NEWFILE ${WorkDir2}/DQM_V0001_R000000001__RelValPhotonJets_Pt_10__CMSSW_${NEWRELEASE}-${NEWGLOBALTAG}__DQM.root endif