+void setObjProps(T obj) {
+ obj->GetXaxis()->SetLabelSize(0.04);
+ obj->GetYaxis()->SetLabelSize(0.04);
+ obj->GetXaxis()->SetTitleSize(0.045);
+
+ obj->GetXaxis()->SetTickLength(-0.015);
+ obj->GetYaxis()->SetTickLength(-0.015);
+
+ obj->GetXaxis()->SetLabelOffset(0.02);
+ obj->GetYaxis()->SetLabelOffset(0.02);
+
+ obj->GetXaxis()->SetTitleOffset(1.3);
+}
+
+BOOST_PYTHON_MODULE(RelValMacro_ext) {
+ using namespace boost::python;
+ def("RelValMacro", RelValMacro);
+}
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros.csh b/Validation/CaloTowers/test/macros/RunRVMacros.csh
deleted file mode 100755
index 476430b70a09f..0000000000000
--- a/Validation/CaloTowers/test/macros/RunRVMacros.csh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/env tcsh
-
-#Check to see if the CMS environment is set up
-if ($?CMSSW_BASE != 1) then
- echo "CMS environment not set up"
-# exit
-endif
-
-#Check for correct number of arguments
-if ($#argv<2) then
- echo "Script needs 2 input variable"
-# exit
-endif
-
-set NEW_VERS=$1
-set OLD_VERS=$2
-
-# Two bit value with the first corresponding to whether the validation version is centrally
-# harvested (1) or not (0) and the second to whether the reference version is harvested. Thus:
-# 00: both are privately produced
-# 01: reference version is harvested, validation version is private
-# 10: validation version is harvested, reference version is private
-# 11: both versions are harvested
-# Any other value is the same as 0
-set harvest=11
-
-#Check if base directory already exists
-if (-d ${NEW_VERS}_vs_${OLD_VERS}_RelVal) then
- echo "Directory already exists"
- exit
-endif
-
-#Create base directory and top directories
-mkdir ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-
-cp ../html_indices/TopLevelRelValSimHits.html index.html
-
-
-#TTbar
-mkdir TTbar
-mkdir TTbar/CaloTowers
-mkdir TTbar/RecHits
-mkdir TTbar/RBX
-mkdir TTbar/HcalDigis
-
-cp ../html_indices/RelVal_HcalDigis.html TTbar/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html TTbar/CaloTowers/index.html
-cp ../html_indices/RBX.html TTbar/RBX/index.html
-
-#cp -r TTbar TTbarStartup
-#mv TTbar TTbarMC
-
-mkdir -p TTbar/SimHits
-cp ../html_indices/RelVal_Simhits.html TTbar/SimHits/index.html
-
-#QCD
-mkdir QCD
-mkdir QCD/CaloTowers
-mkdir QCD/RecHits
-mkdir QCD/RBX
-mkdir QCD/HcalDigis
-
-cp ../html_indices/RelVal_HcalDigis.html QCD/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/QCD_80_120/ > QCD/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html QCD/CaloTowers/index.html
-cp ../html_indices/RBX.html QCD/RBX/index.html
-
-#cp -r QCD QCDStartup
-#mv QCD QCDMC
-
-mkdir -p QCD/SimHits
-cp ../html_indices/RelVal_Simhits.html QCD/SimHits/index.html
-
-#High Pt QCD
-mkdir HighPtQCD
-mkdir HighPtQCD/CaloTowers
-mkdir HighPtQCD/RecHits
-mkdir HighPtQCD/RBX
-mkdir HighPtQCD/HcalDigis
-
-cp ../html_indices/RelVal_HcalDigis.html HighPtQCD/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/QCD_3000_3500/ > HighPtQCD/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html HighPtQCD/CaloTowers/index.html
-cp ../html_indices/RBX.html HighPtQCD/RBX/index.html
-
-mkdir -p HighPtQCD/SimHits
-cp ../html_indices/RelVal_Simhits.html HighPtQCD/SimHits/index.html
-
-#MinBias
-mkdir MinBias
-mkdir MinBias/CaloTowers
-mkdir MinBias/RecHits
-mkdir MinBias/RBX
-mkdir MinBias/HcalDigis
-
-cp ../html_indices/RelVal_HcalDigis.html MinBias/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html MinBias/CaloTowers/index.html
-cp ../html_indices/RBX.html MinBias/RBX/index.html
-
-mkdir -p MinBias/SimHits
-cp ../html_indices/RelVal_Simhits.html MinBias/SimHits/index.html
-
-
-#Single Pions
-
-mkdir SinglePi50_ECAL+HCAL_Scan
-
-cp ../html_indices/SinglePiScan.html SinglePi50_ECAL+HCAL_Scan/index.html
-
-cd ../
-
-
-#Process Startup TTbar
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeMedium
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/RecHits/
-
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeSim
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/SimHits
-
-#Process Startup QCD
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeMedium
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/RecHits/
-
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeSim
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/SimHits
-
-#Process Startup HighPtQCD
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_High.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHigh
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RecHits/
-
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeSim
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/SimHits
-
-#Process Startup MinBias
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_Low.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeLow
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RecHits/
-
-#Process single pions
-
-set OLV = `echo ${OLD_VERS} | sed 's/\([^_]*\).*/\1/'`
-set NWV = `echo ${NEW_VERS} | sed 's/\([^_]*\).*/\1/'`
-./singlePi.exe ${OLV} ${NWV}
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/SinglePi50_ECAL+HCAL_Scan
-
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeSim
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits_Low.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/SimHits
-
-exit
diff --git a/Validation/CaloTowers/test/macros/RunRVMacrosP1.csh b/Validation/CaloTowers/test/macros/RunRVMacrosP1.csh
deleted file mode 100755
index f17825643cdeb..0000000000000
--- a/Validation/CaloTowers/test/macros/RunRVMacrosP1.csh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/env tcsh
-
-#Check to see if the CMS environment is set up
-if ($?CMSSW_BASE != 1) then
- echo "CMS environment not set up"
-# exit
-endif
-
-#Check for correct number of arguments
-if ($#argv<2) then
- echo "Script needs 2 input variable"
-# exit
-endif
-
-set NEW_VERS=$1
-set OLD_VERS=$2
-
-# Two bit value with the first corresponding to whether the validation version is centrally
-# harvested (1) or not (0) and the second to whether the reference version is harvested. Thus:
-# 00: both are privately produced
-# 01: reference version is harvested, validation version is private
-# 10: validation version is harvested, reference version is private
-# 11: both versions are harvested
-# Any other value is the same as 0
-set harvest=11
-
-#Check if base directory already exists
-if (-d ${NEW_VERS}_vs_${OLD_VERS}_RelVal) then
- echo "Directory already exists"
- exit
-endif
-
-#Create base directory and top directories
-mkdir ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-
-cp ../html_indices/TopLevelRelVal.html index.html
-
-
-#TTbar
-mkdir TTbar
-mkdir TTbar/CaloTowers
-mkdir TTbar/RecHits
-mkdir TTbar/RBX
-mkdir TTbar/HcalDigis
-
-cp ../html_indices/Digis_Phase1.html TTbar/HcalDigis/index.html
-cat ../html_indices/RecHits_Phase1.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html TTbar/CaloTowers/index.html
-cp ../html_indices/RBX.html TTbar/RBX/index.html
-
-#cp -r TTbar TTbarStartup
-#mv TTbar TTbarMC
-
-#QCD
-mkdir QCD
-mkdir QCD/CaloTowers
-mkdir QCD/RecHits
-mkdir QCD/RBX
-mkdir QCD/HcalDigis
-
-cp ../html_indices/Digis_Phase1.html QCD/HcalDigis/index.html
-cat ../html_indices/RecHits_Phase1.html | sed -e s/DATA_SAMPLE/QCD_80_120/ > QCD/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html QCD/CaloTowers/index.html
-cp ../html_indices/RBX.html QCD/RBX/index.html
-
-#cp -r QCD QCDStartup
-#mv QCD QCDMC
-
-#High Pt QCD
-mkdir HighPtQCD
-mkdir HighPtQCD/CaloTowers
-mkdir HighPtQCD/RecHits
-mkdir HighPtQCD/RBX
-mkdir HighPtQCD/HcalDigis
-
-cp ../html_indices/Digis_Phase1.html HighPtQCD/HcalDigis/index.html
-cat ../html_indices/RecHits_Phase1.html | sed -e s/DATA_SAMPLE/QCD_3000_3500/ > HighPtQCD/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html HighPtQCD/CaloTowers/index.html
-cp ../html_indices/RBX.html HighPtQCD/RBX/index.html
-
-#MinBias
-mkdir MinBias
-mkdir MinBias/CaloTowers
-mkdir MinBias/RecHits
-mkdir MinBias/RBX
-mkdir MinBias/HcalDigis
-
-cp ../html_indices/Digis_Phase1.html MinBias/HcalDigis/index.html
-cat ../html_indices/RecHits_Phase1.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html MinBias/CaloTowers/index.html
-cp ../html_indices/RBX.html MinBias/RBX/index.html
-
-
-#Single Pions
-
-mkdir SinglePi50_ECAL+HCAL_Scan
-
-cp ../html_indices/SinglePiScan.html SinglePi50_ECAL+HCAL_Scan/index.html
-
-cd ../
-
-
-#Process Startup TTbar
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeMedium
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/RecHits/
-
-#Process Startup QCD
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeMedium
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/RecHits/
-
-#Process Startup HighPtQCD
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_High.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHigh
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RecHits/
-
-#Process Startup MinBias
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_Low.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeLow
-
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RecHits/
-
-#Process single pions
-
-set OLV = `echo ${OLD_VERS} | sed 's/\([^_]*\).*/\1/'`
-set NWV = `echo ${NEW_VERS} | sed 's/\([^_]*\).*/\1/'`
-./singlePi.exe ${OLV} ${NWV}
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/SinglePi50_ECAL+HCAL_Scan
-
-exit
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros2017.csh b/Validation/CaloTowers/test/macros/RunRVMacrosPhase2.csh
similarity index 73%
rename from Validation/CaloTowers/test/macros/RunRVMacros2017.csh
rename to Validation/CaloTowers/test/macros/RunRVMacrosPhase2.csh
index c754d068ac33d..9625122e6f0ec 100755
--- a/Validation/CaloTowers/test/macros/RunRVMacros2017.csh
+++ b/Validation/CaloTowers/test/macros/RunRVMacrosPhase2.csh
@@ -44,16 +44,16 @@ mkdir TTbar/RecHits
mkdir TTbar/RBX
mkdir TTbar/HcalDigis
-cp ../html_indices/RelVal_HcalDigis2017.html TTbar/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits2017.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2017.html TTbar/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigisPhase2.html TTbar/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHitsPhase2.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowersPhase2.html TTbar/CaloTowers/index.html
cp ../html_indices/RBX.html TTbar/RBX/index.html
#cp -r TTbar TTbarStartup
#mv TTbar TTbarMC
mkdir -p TTbar/SimHits
-cp ../html_indices/RelVal_Simhits2017.html TTbar/SimHits/index.html
+cp ../html_indices/RelVal_SimhitsPhase2.html TTbar/SimHits/index.html
#QCD
mkdir QCD
@@ -62,16 +62,16 @@ mkdir QCD/RecHits
mkdir QCD/RBX
mkdir QCD/HcalDigis
-cp ../html_indices/RelVal_HcalDigis2017.html QCD/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits2017.html | sed -e s/DATA_SAMPLE/QCD_80_120/ > QCD/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2017.html QCD/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2018.html QCD/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/QCD_80_120/ > QCD/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2018.html QCD/CaloTowers/index.html
cp ../html_indices/RBX.html QCD/RBX/index.html
#cp -r QCD QCDStartup
#mv QCD QCDMC
mkdir -p QCD/SimHits
-cp ../html_indices/RelVal_Simhits2017.html QCD/SimHits/index.html
+cp ../html_indices/RelVal_Simhits2018.html QCD/SimHits/index.html
#High Pt QCD
mkdir HighPtQCD
@@ -80,28 +80,28 @@ mkdir HighPtQCD/RecHits
mkdir HighPtQCD/RBX
mkdir HighPtQCD/HcalDigis
-cp ../html_indices/RelVal_HcalDigis2017.html HighPtQCD/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits2017.html | sed -e s/DATA_SAMPLE/QCD_3000_3500/ > HighPtQCD/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2017.html HighPtQCD/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2018.html HighPtQCD/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/QCD_3000_3500/ > HighPtQCD/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2018.html HighPtQCD/CaloTowers/index.html
cp ../html_indices/RBX.html HighPtQCD/RBX/index.html
mkdir -p HighPtQCD/SimHits
-cp ../html_indices/RelVal_Simhits2017.html HighPtQCD/SimHits/index.html
+cp ../html_indices/RelVal_Simhits2018.html HighPtQCD/SimHits/index.html
-#MinBias
-mkdir MinBias
-mkdir MinBias/CaloTowers
-mkdir MinBias/RecHits
-mkdir MinBias/RBX
-mkdir MinBias/HcalDigis
+#ZTT
+mkdir ZTT
+mkdir ZTT/CaloTowers
+mkdir ZTT/RecHits
+mkdir ZTT/RBX
+mkdir ZTT/HcalDigis
-cp ../html_indices/RelVal_HcalDigis2017.html MinBias/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits2017.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2017.html MinBias/CaloTowers/index.html
-cp ../html_indices/RBX.html MinBias/RBX/index.html
+cp ../html_indices/RelVal_HcalDigisPhase2.html ZTT/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHitsPhase2.html | sed -e s/DATA_SAMPLE/ZTT/ > ZTT/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowersPhase2.html ZTT/CaloTowers/index.html
+cp ../html_indices/RBX.html ZTT/RBX/index.html
-mkdir -p MinBias/SimHits
-cp ../html_indices/RelVal_Simhits2017.html MinBias/SimHits/index.html
+mkdir -p ZTT/SimHits
+cp ../html_indices/RelVal_SimhitsPhase2.html ZTT/SimHits/index.html
#Single Pions
@@ -115,7 +115,8 @@ cd ../
#Process Startup TTbar
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeHigh
+cp InputRelVal.json-phase2-01Dec2021 InputRelVal.json
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeTTBar
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/CaloTowers/
@@ -129,7 +130,8 @@ mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/SimHits
#Process Startup QCD
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeHigh
+
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeQCD
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/CaloTowers/
@@ -143,7 +145,7 @@ mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/SimHits
#Process Startup HighPtQCD
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_High.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHigh
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHighPtQCD
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/CaloTowers/
@@ -153,17 +155,16 @@ mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RecHits/
./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeSim
#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/SimHits
-#Process Startup MinBias
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_Low.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeHigh
+#Process Startup ZTT
+#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_ZTT_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_ZTT_${NEW_VERS}.root'","InputRelVal_Low.txt")'
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_ZTT_${OLD_VERS}.root HcalRecHitValidationRelVal_ZTT_${NEW_VERS}.root rangeLow
-mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/HcalDigis/
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RecHits/
+mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZTT/HcalDigis/
+mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZTT/CaloTowers/
+mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZTT/RBX/
+mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZTT/RecHits/
#Process single pions
@@ -172,10 +173,10 @@ mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RecHits/
#./singlePi.exe ${OLV} ${NWV}
#mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/SinglePi50_ECAL+HCAL_Scan
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeSim
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits_Low.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_ZTT_${OLD_VERS}.root HcalRecHitValidationRelVal_ZTT_${NEW_VERS}.root rangeSim
+#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_ZTT_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_ZTT_${NEW_VERS}.root'","InputRelVal_SimHits_Low.txt",'${harvest}')'
+#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_ZTT_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_ZTT_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/SimHits
+mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZTT/SimHits
exit
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros_2023.csh b/Validation/CaloTowers/test/macros/RunRVMacros_2023.csh
index aa5468232548b..1cf55934370c1 100755
--- a/Validation/CaloTowers/test/macros/RunRVMacros_2023.csh
+++ b/Validation/CaloTowers/test/macros/RunRVMacros_2023.csh
@@ -34,7 +34,7 @@ endif
mkdir ${NEW_VERS}_vs_${OLD_VERS}_RelVal
cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-cp ../html_indices/TopLevelRelVal_2023.html index.html
+cp ../html_indices/TopLevelRelValSimHits.html index.html
#TTbar
@@ -44,14 +44,50 @@ mkdir TTbar/RecHits
mkdir TTbar/RBX
mkdir TTbar/HcalDigis
-cp ../html_indices/RelVal_HcalDigis_2023.html TTbar/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits_2023.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html TTbar/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2021.html TTbar/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2021.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2021.html TTbar/CaloTowers/index.html
cp ../html_indices/RBX.html TTbar/RBX/index.html
#cp -r TTbar TTbarStartup
#mv TTbar TTbarMC
+mkdir -p TTbar/SimHits
+cp ../html_indices/RelVal_Simhits2021.html TTbar/SimHits/index.html
+
+#QCD
+mkdir QCD
+mkdir QCD/CaloTowers
+mkdir QCD/RecHits
+mkdir QCD/RBX
+mkdir QCD/HcalDigis
+
+cp ../html_indices/RelVal_HcalDigis2018.html QCD/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/QCD_80_120/ > QCD/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2018.html QCD/CaloTowers/index.html
+cp ../html_indices/RBX.html QCD/RBX/index.html
+
+#cp -r QCD QCDStartup
+#mv QCD QCDMC
+
+mkdir -p QCD/SimHits
+cp ../html_indices/RelVal_Simhits2018.html QCD/SimHits/index.html
+
+#High Pt QCD
+mkdir HighPtQCD
+mkdir HighPtQCD/CaloTowers
+mkdir HighPtQCD/RecHits
+mkdir HighPtQCD/RBX
+mkdir HighPtQCD/HcalDigis
+
+cp ../html_indices/RelVal_HcalDigis2018.html HighPtQCD/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/QCD_3000_3500/ > HighPtQCD/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2018.html HighPtQCD/CaloTowers/index.html
+cp ../html_indices/RBX.html HighPtQCD/RBX/index.html
+
+mkdir -p HighPtQCD/SimHits
+cp ../html_indices/RelVal_Simhits2018.html HighPtQCD/SimHits/index.html
+
#MinBias
mkdir MinBias
mkdir MinBias/CaloTowers
@@ -59,22 +95,68 @@ mkdir MinBias/RecHits
mkdir MinBias/RBX
mkdir MinBias/HcalDigis
-cp ../html_indices/RelVal_HcalDigis_2023.html MinBias/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits_2023.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html MinBias/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2021.html MinBias/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2021.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2021.html MinBias/CaloTowers/index.html
cp ../html_indices/RBX.html MinBias/RBX/index.html
-cd ..
+mkdir -p MinBias/SimHits
+cp ../html_indices/RelVal_Simhits2021.html MinBias/SimHits/index.html
+
+
+#Single Pions
+
+mkdir SinglePi50_ECAL+HCAL_Scan
+
+cp ../html_indices/SinglePiScan.html SinglePi50_ECAL+HCAL_Scan/index.html
+
+cd ../
+
#Process Startup TTbar
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeMedium
+cp InputRelVal.json-2023-12July2023 InputRelVal.json
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeTTBar
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/CaloTowers/
mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/RBX/
mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/RecHits/
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeSim
+#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
+#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
+mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/SimHits
+
+#Process Startup QCD
+#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
+
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeQCD
+
+mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/HcalDigis/
+mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/CaloTowers/
+mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/RBX/
+mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/RecHits/
+
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeSim
+#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
+#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
+mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/SimHits
+
+#Process Startup HighPtQCD
+#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_High.txt")'
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHighPtQCD
+
+mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/HcalDigis/
+mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/CaloTowers/
+mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RBX/
+mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RecHits/
+
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeSim
+#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
+#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
+mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/SimHits
+
#Process Startup MinBias
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_Low.txt")'
./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeLow
@@ -84,4 +166,17 @@ mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/CaloTowers/
mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RBX/
mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RecHits/
+#Process single pions
+
+#set OLV = `echo ${OLD_VERS} | sed 's/\([^_]*\).*/\1/'`
+#set NWV = `echo ${NEW_VERS} | sed 's/\([^_]*\).*/\1/'`
+#./singlePi.exe ${OLV} ${NWV}
+#mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/SinglePi50_ECAL+HCAL_Scan
+
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeSim
+#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits_Low.txt",'${harvest}')'
+#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
+
+mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/SimHits
+
exit
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros2018.csh b/Validation/CaloTowers/test/macros/RunRVMacros_2024.csh
similarity index 92%
rename from Validation/CaloTowers/test/macros/RunRVMacros2018.csh
rename to Validation/CaloTowers/test/macros/RunRVMacros_2024.csh
index b482f28aba88a..1cf55934370c1 100755
--- a/Validation/CaloTowers/test/macros/RunRVMacros2018.csh
+++ b/Validation/CaloTowers/test/macros/RunRVMacros_2024.csh
@@ -44,16 +44,16 @@ mkdir TTbar/RecHits
mkdir TTbar/RBX
mkdir TTbar/HcalDigis
-cp ../html_indices/RelVal_HcalDigis2018.html TTbar/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2018.html TTbar/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2021.html TTbar/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2021.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2021.html TTbar/CaloTowers/index.html
cp ../html_indices/RBX.html TTbar/RBX/index.html
#cp -r TTbar TTbarStartup
#mv TTbar TTbarMC
mkdir -p TTbar/SimHits
-cp ../html_indices/RelVal_Simhits2018.html TTbar/SimHits/index.html
+cp ../html_indices/RelVal_Simhits2021.html TTbar/SimHits/index.html
#QCD
mkdir QCD
@@ -95,13 +95,13 @@ mkdir MinBias/RecHits
mkdir MinBias/RBX
mkdir MinBias/HcalDigis
-cp ../html_indices/RelVal_HcalDigis2018.html MinBias/HcalDigis/index.html
-cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2018.html MinBias/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2021.html MinBias/HcalDigis/index.html
+cat ../html_indices/RelVal_RecHits2021.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
+cp ../html_indices/RelVal_CaloTowers2021.html MinBias/CaloTowers/index.html
cp ../html_indices/RBX.html MinBias/RBX/index.html
mkdir -p MinBias/SimHits
-cp ../html_indices/RelVal_Simhits2018.html MinBias/SimHits/index.html
+cp ../html_indices/RelVal_Simhits2021.html MinBias/SimHits/index.html
#Single Pions
@@ -115,7 +115,8 @@ cd ../
#Process Startup TTbar
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeHigh
+cp InputRelVal.json-2023-12July2023 InputRelVal.json
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeTTBar
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/CaloTowers/
@@ -129,7 +130,8 @@ mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/SimHits
#Process Startup QCD
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_Medium.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeHigh
+
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root rangeQCD
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/CaloTowers/
@@ -143,7 +145,7 @@ mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/SimHits
#Process Startup HighPtQCD
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_High.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHigh
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeHighPtQCD
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/CaloTowers/
@@ -153,12 +155,11 @@ mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/RecHits/
./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root rangeSim
#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/SimHits
#Process Startup MinBias
#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_Low.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeHigh
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeLow
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/HcalDigis/
mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/CaloTowers/
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros_DATA.csh b/Validation/CaloTowers/test/macros/RunRVMacros_DATA.csh
deleted file mode 100755
index fde4345bd204e..0000000000000
--- a/Validation/CaloTowers/test/macros/RunRVMacros_DATA.csh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/env tcsh
-
-#Check to see if the CMS environment is set up
-if ($?CMSSW_BASE != 1) then
- echo "CMS environment not set up"
-# exit
-endif
-
-#Check for correct number of arguments
-if ($#argv<2) then
- echo "Script needs 2 input variable"
-# exit
-endif
-
-set NEW_VERS=$1
-set OLD_VERS=$2
-
-# Two bit value with the first corresponding to whether the validation version is centrally
-# harvested (1) or not (0) and the second to whether the reference version is harvested. Thus:
-# 00: both are privately produced
-# 01: reference version is harvested, validation version is private
-# 10: validation version is harvested, reference version is private
-# 11: both versions are harvested
-# Any other value is the same as 0
-set harvest=11
-
-#Check if base directory already exists
-if (-d ${NEW_VERS}_vs_${OLD_VERS}_RelVal) then
- echo "Directory already exists"
- exit
-endif
-
-#Create base directory and top directories
-mkdir ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-
-cp ../html_indices/TopLevelRelVal_DATA.html index.html
-
-#JetHT
-mkdir JetHT
-mkdir JetHT/CaloTowers
-mkdir JetHT/RecHits
-mkdir JetHT/RBX
-
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/JetHT/ > JetHT/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html JetHT/CaloTowers/index.html
-cp ../html_indices/RBX.html JetHT/RBX/index.html
-
-#MinBias
-#mkdir MinBias
-#mkdir MinBias/CaloTowers
-#mkdir MinBias/RecHits
-#mkdir MinBias/RBX
-
-#cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/MinBias/ > MinBias/RecHits/index.html
-#cp ../html_indices/RelVal_CaloTowers.html MinBias/CaloTowers/index.html
-#cp ../html_indices/RBX.html MinBias/RBX/index.html
-
-
-#ZeroBias
-mkdir ZeroBias
-mkdir ZeroBias/CaloTowers
-mkdir ZeroBias/RecHits
-mkdir ZeroBias/RBX
-
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/ZeroBias/ > ZeroBias/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html ZeroBias/CaloTowers/index.html
-cp ../html_indices/RBX.html ZeroBias/RBX/index.html
-
-cd ..
-
-#Process Startup Jet
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_Jet_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_Jet_${NEW_VERS}.root'","InputRelVal_Medium_DATA.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_JetHT_${OLD_VERS}.root HcalRecHitValidationRelVal_JetHT_${NEW_VERS}.root rangeMediumData
-
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/JetHT/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/JetHT/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/JetHT/RecHits/
-
-#Process Startup MinBias
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_Medium_DATA.txt")'
-#./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root rangeMediumData
-
-#mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/CaloTowers/
-#mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RBX/
-#mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/RecHits/
-
-
-#Process Startup ZeroBias
-#root -b -l -q 'RelValMacro.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_ZeroBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_ZeroBias_${NEW_VERS}.root'","InputRelVal_Medium_DATA.txt")'
-./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_ZeroBias_${OLD_VERS}.root HcalRecHitValidationRelVal_ZeroBias_${NEW_VERS}.root rangeLowData
-
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZeroBias/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZeroBias/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/ZeroBias/RecHits/
-
-exit
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros_Pileup2018.csh b/Validation/CaloTowers/test/macros/RunRVMacros_Pileup2023.csh
similarity index 88%
rename from Validation/CaloTowers/test/macros/RunRVMacros_Pileup2018.csh
rename to Validation/CaloTowers/test/macros/RunRVMacros_Pileup2023.csh
index 8f50ba234603c..4b483791443ca 100755
--- a/Validation/CaloTowers/test/macros/RunRVMacros_Pileup2018.csh
+++ b/Validation/CaloTowers/test/macros/RunRVMacros_Pileup2023.csh
@@ -1,4 +1,4 @@
-#!/bin/env tcsh
+#!/bin/tcsh
#Check to see if the CMS environment is set up
if ($?CMSSW_BASE != 1) then
@@ -43,16 +43,17 @@ mkdir TTbar/CaloTowers
mkdir TTbar/RecHits
mkdir TTbar/RBX
-cat ../html_indices/RelVal_RecHits2018.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
+cat ../html_indices/RelVal_RecHits2021.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers2018.html TTbar/CaloTowers/index.html
-cp ../html_indices/RelVal_HcalDigis2018.html TTbar/HcalDigis/index.html
+cp ../html_indices/RelVal_CaloTowers2021.html TTbar/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2021.html TTbar/HcalDigis/index.html
cp ../html_indices/RBX.html TTbar/RBX/index.html
cd ../
#Process Startup TTbar
#root -b -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_Startup_${OLD_VERS}_PileUp.root'","'HcalRecHitValidationRelVal_TTbar_Startup_${NEW_VERS}_PileUp.root'","InputRelVal_Medium.txt",'${harvest}')'
+cp InputRelVal.json-2023-12July2023 InputRelVal.json
./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeMediumPileup
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp/TTbar/HcalDigis/
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros_Pileup.csh b/Validation/CaloTowers/test/macros/RunRVMacros_Pileup2024.csh
similarity index 86%
rename from Validation/CaloTowers/test/macros/RunRVMacros_Pileup.csh
rename to Validation/CaloTowers/test/macros/RunRVMacros_Pileup2024.csh
index 4c971aea042b5..4b483791443ca 100755
--- a/Validation/CaloTowers/test/macros/RunRVMacros_Pileup.csh
+++ b/Validation/CaloTowers/test/macros/RunRVMacros_Pileup2024.csh
@@ -1,4 +1,4 @@
-#!/bin/env tcsh
+#!/bin/tcsh
#Check to see if the CMS environment is set up
if ($?CMSSW_BASE != 1) then
@@ -43,16 +43,17 @@ mkdir TTbar/CaloTowers
mkdir TTbar/RecHits
mkdir TTbar/RBX
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
+cat ../html_indices/RelVal_RecHits2021.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
-cp ../html_indices/RelVal_CaloTowers.html TTbar/CaloTowers/index.html
-cp ../html_indices/RelVal_HcalDigis.html TTbar/HcalDigis/index.html
+cp ../html_indices/RelVal_CaloTowers2021.html TTbar/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigis2021.html TTbar/HcalDigis/index.html
cp ../html_indices/RBX.html TTbar/RBX/index.html
cd ../
#Process Startup TTbar
#root -b -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_Startup_${OLD_VERS}_PileUp.root'","'HcalRecHitValidationRelVal_TTbar_Startup_${NEW_VERS}_PileUp.root'","InputRelVal_Medium.txt",'${harvest}')'
+cp InputRelVal.json-2023-12July2023 InputRelVal.json
./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeMediumPileup
mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp/TTbar/HcalDigis/
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros_PileupPhase2.csh b/Validation/CaloTowers/test/macros/RunRVMacros_PileupPhase2.csh
new file mode 100755
index 0000000000000..302e8d548c712
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/RunRVMacros_PileupPhase2.csh
@@ -0,0 +1,64 @@
+#!/bin/tcsh
+
+#Check to see if the CMS environment is set up
+if ($?CMSSW_BASE != 1) then
+ echo "CMS environment not set up"
+ exit
+endif
+
+#Check for correct number of arguments
+if ($#argv<2) then
+ echo "Script needs 2 input variable"
+ exit
+endif
+
+set NEW_VERS=$1
+set OLD_VERS=$2
+
+# Two bit value with the first corresponding to whether the validation version is centrally
+# harvested (1) or not (0) and the second to whether the reference version is harvested. Thus:
+# 00: both are privately produced
+# 01: reference version is harvested, validation version is private
+# 10: validation version is harvested, reference version is private
+# 11: both versions are harvested
+# Any other value is the same as 0
+set harvest=11
+
+#Check if base directory already exists
+if (-d ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp) then
+ echo "Directory already exists"
+ exit
+endif
+
+#Create base directory and top directories
+mkdir ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp
+cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp
+
+cp ../html_indices/TopLevelRelVal_PileUp.html index.html
+
+#TTbar
+mkdir TTbar
+mkdir TTbar/HcalDigis
+mkdir TTbar/CaloTowers
+mkdir TTbar/RecHits
+mkdir TTbar/RBX
+
+cat ../html_indices/RelVal_RecHitsPhase2.html | sed -e s/DATA_SAMPLE/TTbar/ > TTbar/RecHits/index.html
+
+cp ../html_indices/RelVal_CaloTowersPhase2.html TTbar/CaloTowers/index.html
+cp ../html_indices/RelVal_HcalDigisPhase2.html TTbar/HcalDigis/index.html
+cp ../html_indices/RBX.html TTbar/RBX/index.html
+
+cd ../
+
+#Process Startup TTbar
+#root -b -q 'RelValMacro.C("'${OLD_VERS}_Startup'","'${NEW_VERS}_Startup'","'HcalRecHitValidationRelVal_TTbar_Startup_${OLD_VERS}_PileUp.root'","'HcalRecHitValidationRelVal_TTbar_Startup_${NEW_VERS}_PileUp.root'","InputRelVal_Medium.txt",'${harvest}')'
+cp InputRelVal.json-phase2-01Dec2021 InputRelVal.json
+./RelValMacro.py ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root rangeMediumPileup
+
+mv *HcalDigi*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp/TTbar/HcalDigis/
+mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp/TTbar/CaloTowers/
+mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp/TTbar/RBX/
+mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal_PileUp/TTbar/RecHits/
+
+exit
diff --git a/Validation/CaloTowers/test/macros/RunRVMacros_TTBar_MC.csh b/Validation/CaloTowers/test/macros/RunRVMacros_TTBar_MC.csh
deleted file mode 100755
index 6eeb13dd10963..0000000000000
--- a/Validation/CaloTowers/test/macros/RunRVMacros_TTBar_MC.csh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/env tcsh
-
-#Check to see if the CMS environment is set up
-if ($?CMSSW_BASE != 1) then
- echo "CMS environment not set up"
- exit
-endif
-
-#Check for correct number of arguments
-if ($#argv<2) then
- echo "Script needs 2 input variable"
- exit
-endif
-
-set NEW_VERS=$1
-set OLD_VERS=$2
-
-# Two bit value with the first corresponding to whether the validation version is centrally
-# harvested (1) or not (0) and the second to whether the reference version is harvested. Thus:
-# 00: both are privately produced
-# 01: reference version is harvested, validation version is private
-# 10: validation version is harvested, reference version is private
-# 11: both versions are harvested
-# Any other value is the same as 0
-set harvest=11
-
-#Check if base directory already exists
-if (-d ${NEW_VERS}_vs_${OLD_VERS}_RelVal) then
- echo "Directory already exists"
- exit
-endif
-
-#Create base directory and top directories
-mkdir ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-
-cp ../html_indices/TopLevelOneSample.html index.html
-
-#-------
-mkdir CaloTowers
-mkdir RecHits
-mkdir RBX
-
-cat ../html_indices/RelVal_RecHits.html | sed -e s/DATA_SAMPLE/TTbar/ > RecHits/index.html
-
-cp ../html_indices/RelVal_CaloTowers.html CaloTowers/index.html
-cp ../html_indices/RBX.html RBX/index.html
-
-cd ../
-
-#Process MC TTbar
-root -b -q 'RelValMacro.C("'${OLD_VERS}_MC'","'${NEW_VERS}_MC'","'HcalRecHitValidationRelVal_TTbar_MC_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_MC_${NEW_VERS}.root'","InputRelVal_Medium.txt",'${harvest}')'
-
-mv *CaloTowers*.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/CaloTowers/
-mv RBX*gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/RBX/
-mv *gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/RecHits/
-
-exit
diff --git a/Validation/CaloTowers/test/macros/RunSimHits.csh b/Validation/CaloTowers/test/macros/RunSimHits.csh
deleted file mode 100755
index 9d512db5bf485..0000000000000
--- a/Validation/CaloTowers/test/macros/RunSimHits.csh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/env tcsh
-
-#Check to see if the CMS environment is set up
-if ($?CMSSW_BASE != 1) then
- echo "CMS environment not set up"
-# exit
-endif
-
-#Check for correct number of arguments
-if ($#argv<2) then
- echo "Script needs 2 input variable"
-# exit
-endif
-
-set NEW_VERS=$1
-set OLD_VERS=$2
-
-# Two bit value with the first corresponding to whether the validation version is centrally
-# harvested (1) or not (0) and the second to whether the reference version is harvested. Thus:
-# 00: both are privately produced
-# 01: reference version is harvested, validation version is private
-# 10: validation version is harvested, reference version is private
-# 11: both versions are harvested
-# Any other value is the same as 0
-set harvest=11
-
-#Check if base directory already exists
-#if (-d ${NEW_VERS}_vs_${OLD_VERS}_RelVal) then
-# echo "Directory already exists"
-# exit
-#endif
-
-#Create base directory and top directories
-mkdir -p ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-cd ${NEW_VERS}_vs_${OLD_VERS}_RelVal
-
-cp ../html_indices/TopLevelRelValSimHits.html index.html
-
-#MinBias
-mkdir -p MinBias
-mkdir -p MinBias/SimHits
-cp ../html_indices/RelVal_Simhits.html MinBias/SimHits/index.html
-
-#QCD
-mkdir -p QCD
-mkdir -p QCD/SimHits
-cp ../html_indices/RelVal_Simhits.html QCD/SimHits/index.html
-
-#High Pt QCD
-mkdir -p HighPtQCD
-mkdir -p HighPtQCD/SimHits
-cp ../html_indices/RelVal_Simhits.html HighPtQCD/SimHits/index.html
-
-#TTbar
-mkdir -p TTbar
-mkdir -p TTbar/SimHits
-cp ../html_indices/RelVal_Simhits.html TTbar/SimHits/index.html
-
-
-cd ../
-
-#Process Startup MinBias
-./RelValMacro.exe ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root InputRelVal_SimHits.txt
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits_Low.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_MinBias_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_MinBias_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/MinBias/SimHits
-
-
-#Process Startup QCD
-./RelValMacro.exe ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root InputRelVal_SimHits.txt
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_QCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_QCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
-
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/QCD/SimHits
-
-
-#Process Startup HighPtQCD
-./RelValMacro.exe ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root InputRelVal_SimHits.txt
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_HighPtQCD_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_HighPtQCD_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/HighPtQCD/SimHits
-
-
-#Process Startup TTbar
-./RelValMacro.exe ${OLD_VERS} ${NEW_VERS} HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root InputRelVal_SimHits.txt
-#root -b -q 'RelValMacro_SimHitsValidationHcal.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_SimHits_Low_Free_y.txt",'${harvest}')'
-#root -b -q 'RelValMacro_HcalSimHitsTask.C("'${OLD_VERS}'","'${NEW_VERS}'","'HcalRecHitValidationRelVal_TTbar_${OLD_VERS}.root'","'HcalRecHitValidationRelVal_TTbar_${NEW_VERS}.root'","InputRelVal_SimHits.txt",'${harvest}')'
-
-mv *.gif ${NEW_VERS}_vs_${OLD_VERS}_RelVal/TTbar/SimHits
-
-exit
diff --git a/Validation/CaloTowers/test/macros/SinglePi.C b/Validation/CaloTowers/test/macros/SinglePi.C
index 161ecbca473cb..9ce4fe0c2bd04 100644
--- a/Validation/CaloTowers/test/macros/SinglePi.C
+++ b/Validation/CaloTowers/test/macros/SinglePi.C
@@ -19,701 +19,654 @@
#include "rootlogon.h"
-TDirectory* fileDirectory( TDirectory *target, std::string s);
-void SinglePi(const TString ref_vers="330pre6", const TString val_vers="330pre6", bool fastsim=false);
-
-int main(int argn, char **argv)
-{
- if(argn == 3) SinglePi(argv[1], argv[2]);
- else if(argn == 4) SinglePi(argv[1], argv[2], strcmp(argv[3], "fastsim") == 0);
- else printf("Usage: ./SinglePi.exe ref_ver val_ver [fastsim]\n");
+TDirectory *fileDirectory(TDirectory *target, std::string s);
+void SinglePi(const TString ref_vers = "330pre6", const TString val_vers = "330pre6", bool fastsim = false);
+
+int main(int argn, char **argv) {
+ if (argn == 3)
+ SinglePi(argv[1], argv[2]);
+ else if (argn == 4)
+ SinglePi(argv[1], argv[2], strcmp(argv[3], "fastsim") == 0);
+ else
+ printf("Usage: ./SinglePi.exe ref_ver val_ver [fastsim]\n");
}
-void SinglePi(const TString ref_vers, const TString val_vers, bool fastsim){
-
- //Warning!!! This rootlogon hacks the root color pallate
- setColors();
-
- TString ref_file = "pi50scan"+ref_vers+"_ECALHCAL_CaloTowers.root";
- TString val_file = "pi50scan"+val_vers+"_ECALHCAL_CaloTowers.root";
-
- TFile f1(ref_file);
- TFile f2(val_file);
-
- // service variables
- //
- //Profiles
- const int Nprof = 21; // insetad of 12 to include Chi2 prof for HB/HE and increased to 20 to include PF clusters.
-
- TProfile* f1_prof[Nprof];
- TProfile* f2_prof[Nprof];
-
- char labelp[Nprof][64];
-
- //1D Histos
- const int Nhist1 = 25; // insetad of 11 to include Chi2 hist for HB/HE, changed to 25 to include PF cluster energy.
-
- TH1* f1_hist1[Nhist1];
- TH1* f2_hist1[Nhist1];
-
- char label1[Nhist1][64];
-
- //Labels
- //Profiles
- sprintf(labelp[0], "CaloTowersTask_emean_vs_ieta_E1.gif");
- sprintf(labelp[1], "CaloTowersTask_emean_vs_ieta_H1.gif");
- sprintf(labelp[2], "CaloTowersTask_emean_vs_ieta_EH1.gif");
-
- sprintf(labelp[3], "RecHitsTask_emean_vs_ieta_E.gif");
- sprintf(labelp[4], "RecHitsTask_emean_vs_ieta_H.gif");
- sprintf(labelp[5], "RecHitsTask_emean_vs_ieta_EH.gif");
- if (!fastsim) {
- sprintf(labelp[6], "SimHitsTask_emean_vs_ieta_E.gif");
- sprintf(labelp[7], "SimHitsTask_emean_vs_ieta_H.gif");
- sprintf(labelp[8], "SimHitsTask_emean_vs_ieta_EH.gif");
- }
- sprintf(labelp[9], "RecHitsTask_timing_vs_energy_profile_HB.gif");
- sprintf(labelp[10], "RecHitsTask_timing_vs_energy_profile_HE.gif");
- sprintf(labelp[11], "RecHitsTask_timing_vs_energy_profile_HF.gif");
-
- sprintf(labelp[12], "RecHitsTask_Chi2_vs_energy_HE.gif");
- sprintf(labelp[13], "RecHitsTask_Chi2_vs_energy_HB.gif");
-
-
- sprintf(labelp[14], "PFClustersTask_emean_vs_eta_E.gif");
- sprintf(labelp[15], "PFClustersTask_emean_vs_eta_H.gif");
- sprintf(labelp[16], "PFClustersTask_emean_vs_eta_EH.gif");
- sprintf(labelp[17], "PFClustersTask_emean_vs_eta_HF.gif");
- sprintf(labelp[18], "PFClustersTask_emean_vs_eta_HO.gif");
- sprintf(labelp[19], "PFClustersTask_emean_vs_eta_EHF.gif");
- sprintf(labelp[20], "PFClustersTask_emean_vs_eta_EHFO.gif");
-
-
- /*
- sprintf(labelp[12], "CaloTowersTask_emean_vs_ieta_E.gif");
- sprintf(labelp[13], "CaloTowersTask_emean_vs_ieta_H.gif");
- sprintf(labelp[14], "CaloTowersTask_emean_vs_ieta_EH.gif");
- */
-
- //1D Histos
- sprintf(label1[0], "N_calotowers_HB.gif");
- sprintf(label1[1], "N_calotowers_HE.gif");
- sprintf(label1[2], "N_calotowers_HF.gif");
-
- sprintf(label1[3], "RecHits_energy_HB.gif");
- sprintf(label1[4], "RecHits_energy_HE.gif");
- sprintf(label1[5], "RecHits_energy_HO.gif");
- sprintf(label1[6], "RecHits_energy_HF.gif");
-
- sprintf(label1[11], "RecHits_Chi2_HE.gif");
- sprintf(label1[12], "RecHits_Chi2_HB.gif");
-
-
- sprintf(label1[7], "Ndigis_HB.gif" );
- sprintf(label1[8], "Ndigis_HE.gif" );
- sprintf(label1[9], "Ndigis_HO.gif" );
- sprintf(label1[10], "Ndigis_HF.gif" );
-
- sprintf(label1[13], "Ratio_Esummed_ECAL_HCAL_0.gif");
- sprintf(label1[14], "Ratio_Esummed_ECAL_HCAL_HO_0.gif");
- sprintf(label1[15], "Ratio_Esummed_ECAL_HCAL_1.gif");
- sprintf(label1[16], "Ratio_Esummed_ECAL_HCAL_HO_1.gif");
- sprintf(label1[17], "Ratio_Esummed_ECAL_HCAL_2.gif");
- sprintf(label1[18], "Ratio_Esummed_ECAL_HCAL_HO_2.gif");
- sprintf(label1[19], "Ratio_Esummed_ECAL_HCAL_3.gif");
- sprintf(label1[20], "Ratio_Esummed_ECAL_HCAL_HO_3.gif");
- sprintf(label1[21], "Ratio_Esummed_ECAL_HCAL_4.gif");
- sprintf(label1[22], "Ratio_Esummed_ECAL_HCAL_HO_4.gif");
-
- sprintf(label1[23], "Ratio_Esummed_HF_5.gif");
- sprintf(label1[24], "Ratio_Esummed_HF_6.gif");
-
-
- // REFERENCE FILE
-
- TDirectory *td = fileDirectory(&f1, "CaloTowersTask");
- //f1.cd("DQMData/CaloTowersV/CaloTowersTask");
- //gDirectory->pwd();
- td->pwd();
- f1_prof[0] = (TProfile*)td->Get("emean_vs_ieta_E1");
- f1_prof[1] = (TProfile*)td->Get("emean_vs_ieta_H1");
- f1_prof[2] = (TProfile*)td->Get("emean_vs_ieta_EH1");
-
- /*
- f1_prof[12] = (TProfile*)td->Get("emean_vs_ieta_E");
- f1_prof[13] = (TProfile*)td->Get("emean_vs_ieta_H");
- f1_prof[14] = (TProfile*)td->Get("emean_vs_ieta_EH");
- */
-
- f1_hist1[0] = (TH1*)td->Get("CaloTowersTask_number_of_fired_towers_HB");
- f1_hist1[1] = (TH1*)td->Get("CaloTowersTask_number_of_fired_towers_HE");
- f1_hist1[2] = (TH1*)td->Get("CaloTowersTask_number_of_fired_towers_HF");
-
-
- td =fileDirectory(&f1, "PFClusterV");
- f1_prof[14] = (TProfile*)td->Get("emean_vs_eta_E");
- f1_prof[15] = (TProfile*)td->Get("emean_vs_eta_H");
- f1_prof[16] = (TProfile*)td->Get("emean_vs_eta_EH");
- f1_prof[17] = (TProfile*)td->Get("emean_vs_eta_HF");
- f1_prof[18] = (TProfile*)td->Get("emean_vs_eta_HO");
- f1_prof[19] = (TProfile*)td->Get("emean_vs_eta_EHF");
- f1_prof[20] = (TProfile*)td->Get("emean_vs_eta_EHFO");
-
- f1_hist1[13] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_0");
- f1_hist1[14] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_0");
- f1_hist1[15] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_1");
- f1_hist1[16] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_1");
- f1_hist1[17] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_2");
- f1_hist1[18] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_2");
- f1_hist1[19] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_3");
- f1_hist1[20] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_3");
- f1_hist1[21] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_4");
- f1_hist1[22] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_4");
-
- f1_hist1[23] = (TH1*)td->Get("Ratio_Esummed_HF_5");
- f1_hist1[24] = (TH1*)td->Get("Ratio_Esummed_HF_6");
-
-
- td = fileDirectory(&f1, "HcalRecHitTask");
- //f1.cd("DQMData/HcalRecHitsV/HcalRecHitTask");
- f1_prof[3] = (TProfile*)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
- f1_prof[4] = (TProfile*)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
- f1_prof[5] = (TProfile*)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
-
- f1_prof[9] = (TProfile*)td->Get("HcalRecHitTask_timing_vs_energy_profile_HB");
- f1_prof[10] = (TProfile*)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HE");
- f1_prof[11] = (TProfile*)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HF");
-
- f1_prof[12] = (TProfile*)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HE");
- f1_prof[13] = (TProfile*)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HB");
-
-
- f1_hist1[3] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HB");
- f1_hist1[4] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HE");
- f1_hist1[5] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HO");
- f1_hist1[6] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HF");
-
- f1_hist1[11] = (TH1*)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HE");
- f1_hist1[12] = (TH1*)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HB");
-
-
- td = fileDirectory(&f1, "HcalDigiTask");
- f1_hist1[7] = (TH1*)td->Get("HcalDigiTask_Ndigis_HB");
- f1_hist1[8] = (TH1*)td->Get("HcalDigiTask_Ndigis_HE");
- f1_hist1[9] = (TH1*)td->Get("HcalDigiTask_Ndigis_HO");
- f1_hist1[10] = (TH1*)td->Get("HcalDigiTask_Ndigis_HF");
-
-
- if (!fastsim) {
- td = fileDirectory(&f1, "HcalSimHitTask");
- //f1.cd("DQMData/HcalSimHitsV/HcalSimHitTask");
- f1_prof[6] = (TProfile*)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_E");
- f1_prof[7] = (TProfile*)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths");
- f1_prof[8] = (TProfile*)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_EH");
- }
-
- // NEW FILE
-
- td = fileDirectory(&f2, "CaloTowersTask");
- //f2.cd("DQMData/CaloTowersV/CaloTowersTask");
- //gDirectory->pwd();
- td->pwd();
- f2_prof[0] = (TProfile*)td->Get("emean_vs_ieta_E1");
- f2_prof[1] = (TProfile*)td->Get("emean_vs_ieta_H1");
- f2_prof[2] = (TProfile*)td->Get("emean_vs_ieta_EH1");
-
- /*
- f2_prof[12] = (TProfile*)td->Get("emean_vs_ieta_E");
- f2_prof[13] = (TProfile*)td->Get("emean_vs_ieta_H");
- f2_prof[14] = (TProfile*)td->Get("emean_vs_ieta_EH");
- */
-
- f2_hist1[0] = (TH1*)td->Get("CaloTowersTask_number_of_fired_towers_HB");
- f2_hist1[1] = (TH1*)td->Get("CaloTowersTask_number_of_fired_towers_HE");
- f2_hist1[2] = (TH1*)td->Get("CaloTowersTask_number_of_fired_towers_HF");
-
-
- td = fileDirectory(&f2, "PFClusterV");
- f2_prof[14] = (TProfile*)td->Get("emean_vs_eta_E");
- f2_prof[15] = (TProfile*)td->Get("emean_vs_eta_H");
- f2_prof[16] = (TProfile*)td->Get("emean_vs_eta_EH");
- f2_prof[17] = (TProfile*)td->Get("emean_vs_eta_HF");
- f2_prof[18] = (TProfile*)td->Get("emean_vs_eta_HO");
- f2_prof[19] = (TProfile*)td->Get("emean_vs_eta_EHF");
- f2_prof[20] = (TProfile*)td->Get("emean_vs_eta_EHFO");
-
- f2_hist1[13] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_0");
- f2_hist1[14] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_0");
- f2_hist1[15] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_1");
- f2_hist1[16] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_1");
- f2_hist1[17] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_2");
- f2_hist1[18] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_2");
- f2_hist1[19] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_3");
- f2_hist1[20] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_3");
- f2_hist1[21] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_4");
- f2_hist1[22] = (TH1*)td->Get("Ratio_Esummed_ECAL_HCAL_HO_4");
-
- f2_hist1[23] = (TH1*)td->Get("Ratio_Esummed_HF_5");
- f2_hist1[24] = (TH1*)td->Get("Ratio_Esummed_HF_6");
-
- td = fileDirectory(&f2, "HcalRecHitTask");
- //f2.cd("DQMData/HcalRecHitsV/HcalRecHitTask");
- f2_prof[3] = (TProfile*)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
- f2_prof[4] = (TProfile*)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
- f2_prof[5] = (TProfile*)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
-
- f2_prof[9] = (TProfile*)td->Get("HcalRecHitTask_timing_vs_energy_profile_HB");
- f2_prof[10] = (TProfile*)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HE");
- f2_prof[11] = (TProfile*)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HF");
-
- f2_prof[12] = (TProfile*)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HE");
- f2_prof[13] = (TProfile*)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HB");
-
-
- f2_hist1[3] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HB");
- f2_hist1[4] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HE");
- f2_hist1[5] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HO");
- f2_hist1[6] = (TH1*)td->Get("HcalRecHitTask_energy_of_rechits_HF");
-
-
- f2_hist1[11] = (TH1*)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HE");
- f2_hist1[12] = (TH1*)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HB");
-
-
- td = fileDirectory(&f2, "HcalDigiTask");
- f2_hist1[7] = (TH1*)td->Get("HcalDigiTask_Ndigis_HB");
- f2_hist1[8] = (TH1*)td->Get("HcalDigiTask_Ndigis_HE");
- f2_hist1[9] = (TH1*)td->Get("HcalDigiTask_Ndigis_HO");
- f2_hist1[10] = (TH1*)td->Get("HcalDigiTask_Ndigis_HF");
-
- if (!fastsim) {
- td = fileDirectory(&f2, "HcalSimHitTask");
- //f2.cd("DQMData/HcalSimHitsV/HcalSimHitTask");
- f2_prof[6] = (TProfile*)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_E");
- f2_prof[7] = (TProfile*)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths");
- f2_prof[8] = (TProfile*)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_EH");
- }
-
-
-
- //Profiles titles
- f1_prof[0]->GetXaxis()->SetTitle("CaloTowers eE (GeV) vs ieta 1 Tower");
- f1_prof[1]->GetXaxis()->SetTitle("CaloTowers hE (GeV) vs ieta 1 Tower");
- f1_prof[2]->GetXaxis()->SetTitle("CaloTowers eE+hE (GeV) vs ieta 1 Tower");
-
-
- f1_prof[3]->GetXaxis()->SetTitle("RecHits eE (GeV) vs ieta R = 0.3 Cone");
- f1_prof[4]->GetXaxis()->SetTitle("RecHits hE (GeV) vs ieta R = 0.3 Cone");
- f1_prof[5]->GetXaxis()->SetTitle("RecHits eE+hE (GeV) vs ieta R = 0.3 Cone");
-
- if (!fastsim) {
- f1_prof[6]->GetXaxis()->SetTitle("SimHits eE (GeV) vs ieta R = 0.3 Cone");
- f1_prof[7]->GetXaxis()->SetTitle("SimHits hE (GeV) vs ieta R = 0.3 Cone");
- f1_prof[8]->GetXaxis()->SetTitle("SimHits eE+hE (GeV) vs ieta R = 0.3 Cone");
- }
-
- f1_prof[9]->GetXaxis()->SetTitle("HB RecHits timing (ns) vs Energy (GeV)");
- f1_prof[10]->GetXaxis()->SetTitle("HE RecHits timing (ns) vs Energy (GeV)");
- f1_prof[11]->GetXaxis()->SetTitle("HF RecHits timing (ns) vs Energy (GeV)");
-
- f1_prof[12]->GetXaxis()->SetTitle("HE log_10(Chi2) vs Energy (GeV)");
- f1_prof[13]->GetXaxis()->SetTitle("HB log_10(Chi2) vs Energy (GeV)");
-
- f1_prof[14]->GetXaxis()->SetTitle("PFClusters eE (GeV) vs eta");
- f1_prof[15]->GetXaxis()->SetTitle("PFClusters hE (GeV) vs eta");
- f1_prof[16]->GetXaxis()->SetTitle("PFClusters eE+hE (GeV) vs eta");
- f1_prof[17]->GetXaxis()->SetTitle("PFClusters hfE (GeV) vs eta");
- f1_prof[18]->GetXaxis()->SetTitle("PFClusters hoE (GeV) vs eta");
- f1_prof[19]->GetXaxis()->SetTitle("PFClusters eE+hE+hfE (GeV) vs eta");
- f1_prof[20]->GetXaxis()->SetTitle("PFClusters eE+hE+hfE+hoE (GeV) vs eta");
-
-
- /*
- f1_prof[12]->GetXaxis()->SetTitle("CaloTowers eE Rcone sum (GeV) vs ieta");
- f1_prof[13]->GetXaxis()->SetTitle("CaloTowers hE Rcone sumn (GeV) vs ieta");
- f1_prof[14]->GetXaxis()->SetTitle("CaloTowers eE+hE Rcone sum (GeV) vs ieta ");
- */
-
-
- //1D Histos titles
- f1_hist1[0]->GetXaxis()->SetTitle("Number of HB CaloTowers");
- f1_hist1[1]->GetXaxis()->SetTitle("Number of HE CaloTowers");
- f1_hist1[2]->GetXaxis()->SetTitle("Number of HF CaloTowers");
-
- f1_hist1[3]->GetXaxis()->SetTitle("HB RecHits energy (GeV)");
- f1_hist1[4]->GetXaxis()->SetTitle("HE RecHits energy (GeV)");
- f1_hist1[5]->GetXaxis()->SetTitle("HO RecHits energy (GeV)");
- f1_hist1[6]->GetXaxis()->SetTitle("HF RecHits energy (GeV)");
-
- f1_hist1[7]->GetXaxis()->SetTitle("N_HB Digis");
- f1_hist1[8]->GetXaxis()->SetTitle("N_HE Digis");
- f1_hist1[9]->GetXaxis()->SetTitle("N_H0 Digis");
- f1_hist1[10]->GetXaxis()->SetTitle("N_HF Digis");
-
- f1_hist1[11]->GetXaxis()->SetTitle("HE log_10(Chi2)");
- f1_hist1[12]->GetXaxis()->SetTitle("HB log_10(Chi2)");
-
-
- f1_hist1[13]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_0");
- f1_hist1[14]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_HO_0");
- f1_hist1[15]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_1");
- f1_hist1[16]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_HO_1");
- f1_hist1[17]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_2");
- f1_hist1[18]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_HO_2");
- f1_hist1[19]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_3");
- f1_hist1[20]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_HO_3");
- f1_hist1[21]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_4");
- f1_hist1[22]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_HO_4");
-
- f1_hist1[23]->GetXaxis()->SetTitle("Esummed/Egen_HF_5");
- f1_hist1[24]->GetXaxis()->SetTitle("Esummed/Egen_HF_6");
-
-
- //
- f1_prof[0]->SetMaximum(20.); // CaloTowers 1
- f1_prof[1]->SetMaximum(40.);
- f1_prof[2]->SetMaximum(40.);
- f1_prof[0]->SetMinimum(0.); // idem
- f1_prof[1]->SetMinimum(0.);
- f1_prof[2]->SetMinimum(0.);
-
- f1_prof[3]->SetMaximum(30.); // RecHits R==0.3
- f1_prof[4]->SetMaximum(50.);
- f1_prof[5]->SetMaximum(60.);
- f1_prof[3]->SetMinimum(0.);
- f1_prof[4]->SetMinimum(0.);
- f1_prof[5]->SetMinimum(0.);
-
-
- if (!fastsim) { // SimHits R=0.3
- f1_prof[6]->SetMinimum(0.);
- f1_prof[7]->SetMinimum(0.);
- f1_prof[8]->SetMinimum(0.);
- f1_prof[6]->SetMaximum(20.);
- f1_prof[7]->SetMaximum(50.);
- f1_prof[8]->SetMaximum(60.);
- }
-
-
- f1_prof[9]->SetMinimum(-25.); // RecHits Timing
- f1_prof[10]->SetMinimum(-25.);
- f1_prof[11]->SetMinimum(-25.);
- f1_prof[9]->SetMaximum(25.);
- f1_prof[10]->SetMaximum(25.);
- f1_prof[11]->SetMaximum(25.);
-
- /*
- f1_prof[12]->SetMaximum(30.); // CaloTowers R=0.3 added
- f1_prof[13]->SetMaximum(50.);
- f1_prof[14]->SetMaximum(60.);
- f1_prof[12]->SetMinimum(0.);
- f1_prof[13]->SetMinimum(0.);
- f1_prof[14]->SetMinimum(0.);
- */
-
- f1_prof[9]->GetXaxis()->SetRangeUser(0.,75.);
- f1_prof[10]->GetXaxis()->SetRangeUser(0.,75.);
- f1_prof[11]->GetXaxis()->SetRangeUser(0.,75.);
-
- f1_prof[12]->GetXaxis()->SetRangeUser(0.,50.); // Chi2
- f1_prof[12]->SetMinimum(0.);
- f1_prof[12]->SetMaximum(1.0);
-
- f1_prof[13]->GetXaxis()->SetRangeUser(0.,50.); // Chi2
- f1_prof[13]->SetMinimum(0.);
- f1_prof[13]->SetMaximum(1.0);
-
- f1_prof[14]->SetMaximum(20.); // PFClusters 1
- f1_prof[15]->SetMaximum(55.);
- f1_prof[16]->SetMaximum(55.);
- f1_prof[14]->SetMinimum(0.); // idem
- f1_prof[15]->SetMinimum(0.);
- f1_prof[16]->SetMinimum(0.);
-
- f1_prof[17]->SetMaximum(55.); // PFClusters 2
- f1_prof[18]->SetMaximum(1.);
- f1_prof[19]->SetMaximum(55.);
- f1_prof[20]->SetMaximum(55.);
- f1_prof[17]->SetMinimum(0.); // idem
- f1_prof[18]->SetMinimum(0.);
- f1_prof[19]->SetMinimum(0.);
- f1_prof[20]->SetMinimum(0.);
-
-
-
- // 1D HISTOS
-
- f1_hist1[0]->GetXaxis()->SetRangeUser(0.,200.); // N_CaloTowers
- f2_hist1[0]->GetXaxis()->SetRangeUser(0.,200.);
-
- f1_hist1[1]->GetXaxis()->SetRangeUser(0.,150.);
- f2_hist1[1]->GetXaxis()->SetRangeUser(0.,150.);
-
- f1_hist1[2]->GetXaxis()->SetRangeUser(0.,500.);
- f2_hist1[2]->GetXaxis()->SetRangeUser(0.,500.);
-
- f1_hist1[3]->GetXaxis()->SetRangeUser(0.,100.); // RecHits spectra
- f2_hist1[3]->GetXaxis()->SetRangeUser(0.,100.);
-
- f1_hist1[4]->GetXaxis()->SetRangeUser(0.,100.);
- f2_hist1[4]->GetXaxis()->SetRangeUser(0.,100.);
-
- f1_hist1[5]->GetXaxis()->SetRangeUser(0.,100.);
- f2_hist1[5]->GetXaxis()->SetRangeUser(0.,100.);
-
- f1_hist1[6]->GetXaxis()->SetRangeUser(0.,100.);
- f2_hist1[6]->GetXaxis()->SetRangeUser(0.,100.);
-
- f1_hist1[3]->SetMaximum(1.e8);
- f1_hist1[4]->SetMaximum(1.e8);
- f1_hist1[5]->SetMaximum(1.e8);
- f1_hist1[6]->SetMaximum(1.e8);
-
- f1_hist1[7]->GetXaxis()->SetRangeUser(0.,1000); // N_Digis
- f2_hist1[7]->GetXaxis()->SetRangeUser(0.,1000);
-
- f1_hist1[8]->GetXaxis()->SetRangeUser(0.,200);
- f2_hist1[8]->GetXaxis()->SetRangeUser(0.,200);
-
- f1_hist1[9]->GetXaxis()->SetRangeUser(0.,100);
- f2_hist1[9]->GetXaxis()->SetRangeUser(0.,100);
-
- f1_hist1[10]->GetXaxis()->SetRangeUser(0.,3500);
- f2_hist1[10]->GetXaxis()->SetRangeUser(0.,3500);
-
-
- // gStyle->SetErrorX(0);
-
-
- // 1D-histo
-
- for (int i = 0; i < Nhist1; i++){
-
- TCanvas *myc = new TCanvas("myc","",800,600);
- gStyle->SetOptStat(1111);
-
- if((i > 2 && i < 7) || (i >= 11 && i <= 12)) myc->SetLogy();
-
- f1_hist1[i]->SetStats(kTRUE); // stat box
- f2_hist1[i]->SetStats(kTRUE);
-
- f1_hist1[i]->SetTitle("");
- f2_hist1[i]->SetTitle("");
-
- f1_hist1[i]->SetLineWidth(2);
- f2_hist1[i]->SetLineWidth(2);
-
- // diffferent histo colors and styles
- f1_hist1[i]->SetLineColor(41);
- f1_hist1[i]->SetLineStyle(1);
-
- f2_hist1[i]->SetLineColor(43);
- f2_hist1[i]->SetLineStyle(2);
-
- //Set maximum to the larger of the two
- if (f1_hist1[i]->GetMaximum() < f2_hist1[i]->GetMaximum()) f1_hist1[i]->SetMaximum(1.05 * f2_hist1[i]->GetMaximum());
-
- TLegend *leg = new TLegend(0.2, 0.91, 0.6, 0.99, "","brNDC");
-
- leg->SetBorderSize(2);
- // leg->SetFillColor(51); // see new color definition above
- leg->SetFillStyle(1001); //
- leg->AddEntry(f1_hist1[i],"CMSSW_"+ref_vers,"l");
- leg->AddEntry(f2_hist1[i],"CMSSW_"+val_vers,"l");
-
-
- TPaveStats *ptstats = new TPaveStats(0.85,0.86,0.98,0.98,"brNDC");
- ptstats->SetTextColor(41);
- f1_hist1[i]->GetListOfFunctions()->Add(ptstats);
- ptstats->SetParent(f1_hist1[i]->GetListOfFunctions());
- TPaveStats *ptstats2 = new TPaveStats(0.85,0.74,0.98,0.86,"brNDC");
- ptstats2->SetTextColor(43);
- f2_hist1[i]->GetListOfFunctions()->Add(ptstats2);
- ptstats2->SetParent(f2_hist1[i]->GetListOfFunctions());
-
- f1_hist1[i]->Draw(""); // "stat"
- f2_hist1[i]->Draw("hist sames");
-
- leg->Draw();
-
- myc->SaveAs(label1[i]);
+void SinglePi(const TString ref_vers, const TString val_vers, bool fastsim) {
+ //Warning!!! This rootlogon hacks the root color pallate
+ setColors();
- if(myc) delete myc;
+ TString ref_file = "pi50scan" + ref_vers + "_ECALHCAL_CaloTowers.root";
+ TString val_file = "pi50scan" + val_vers + "_ECALHCAL_CaloTowers.root";
- std::cout << "1D histos " << i << " produced" << std::endl;
+ TFile f1(ref_file);
+ TFile f2(val_file);
- }
+ // service variables
+ //
+ //Profiles
+ const int Nprof = 24;
+ TProfile *f1_prof[Nprof];
+ TProfile *f2_prof[Nprof];
+ char labelp[Nprof][64];
- // Profiles
- for (int i = 0; i < Nprof; i++){
+ //1D Histos
+ const int Nhist1 = 25;
+
+ TH1 *f1_hist1[Nhist1];
+ TH1 *f2_hist1[Nhist1];
+
+ char label1[Nhist1][64];
+
+ //Labels
+ //Profiles
+ sprintf(labelp[0], "CaloTowersTask_emean_vs_ieta_E1.gif");
+ sprintf(labelp[1], "CaloTowersTask_emean_vs_ieta_H1.gif");
+ sprintf(labelp[2], "CaloTowersTask_emean_vs_ieta_EH1.gif");
+
+ sprintf(labelp[3], "RecHitsTask_emean_vs_ieta_E.gif");
+ sprintf(labelp[4], "RecHitsTask_emean_vs_ieta_H.gif");
+ sprintf(labelp[5], "RecHitsTask_emean_vs_ieta_EH.gif");
+ if (!fastsim) {
+ sprintf(labelp[6], "SimHitsTask_emean_vs_ieta_E.gif");
+ sprintf(labelp[7], "SimHitsTask_emean_vs_ieta_H.gif");
+ sprintf(labelp[8], "SimHitsTask_emean_vs_ieta_EH.gif");
+ }
+ sprintf(labelp[9], "RecHitsTask_timing_vs_energy_profile_HB.gif");
+ sprintf(labelp[10], "RecHitsTask_timing_vs_energy_profile_HE.gif");
+ sprintf(labelp[11], "RecHitsTask_timing_vs_energy_profile_HF.gif");
+
+ sprintf(labelp[12], "RecHitsTask_Chi2_vs_energy_HE.gif");
+ sprintf(labelp[13], "RecHitsTask_Chi2_vs_energy_HB.gif");
+
+ sprintf(labelp[14], "CaloTowersTask_emean_vs_ieta_E.gif");
+ sprintf(labelp[15], "CaloTowersTask_emean_vs_ieta_H.gif");
+ sprintf(labelp[16], "CaloTowersTask_emean_vs_ieta_EH.gif");
+
+ sprintf(labelp[17], "PFClustersTask_emean_vs_eta_E.gif");
+ sprintf(labelp[18], "PFClustersTask_emean_vs_eta_H.gif");
+ sprintf(labelp[19], "PFClustersTask_emean_vs_eta_EH.gif");
+ sprintf(labelp[20], "PFClustersTask_emean_vs_eta_HF.gif");
+ sprintf(labelp[21], "PFClustersTask_emean_vs_eta_HO.gif");
+ sprintf(labelp[22], "PFClustersTask_emean_vs_eta_EHF.gif");
+ sprintf(labelp[23], "PFClustersTask_emean_vs_eta_EHFO.gif");
+
+ //1D Histos
+ sprintf(label1[0], "N_calotowers_HB.gif");
+ sprintf(label1[1], "N_calotowers_HE.gif");
+ sprintf(label1[2], "N_calotowers_HF.gif");
+
+ sprintf(label1[3], "RecHits_energy_HB.gif");
+ sprintf(label1[4], "RecHits_energy_HE.gif");
+ sprintf(label1[5], "RecHits_energy_HO.gif");
+ sprintf(label1[6], "RecHits_energy_HF.gif");
+
+ sprintf(label1[7], "Ndigis_HB.gif");
+ sprintf(label1[8], "Ndigis_HE.gif");
+ sprintf(label1[9], "Ndigis_HO.gif");
+ sprintf(label1[10], "Ndigis_HF.gif");
+
+ sprintf(label1[11], "RecHits_Chi2_HE.gif");
+ sprintf(label1[12], "RecHits_Chi2_HB.gif");
+
+ sprintf(label1[13], "Ratio_Esummed_ECAL_HCAL_0.gif");
+ sprintf(label1[14], "Ratio_Esummed_ECAL_HCAL_HO_0.gif");
+ sprintf(label1[15], "Ratio_Esummed_ECAL_HCAL_1.gif");
+ sprintf(label1[16], "Ratio_Esummed_ECAL_HCAL_HO_1.gif");
+ sprintf(label1[17], "Ratio_Esummed_ECAL_HCAL_2.gif");
+ sprintf(label1[18], "Ratio_Esummed_ECAL_HCAL_HO_2.gif");
+ sprintf(label1[19], "Ratio_Esummed_ECAL_HCAL_3.gif");
+ sprintf(label1[20], "Ratio_Esummed_ECAL_HCAL_HO_3.gif");
+ sprintf(label1[21], "Ratio_Esummed_ECAL_HCAL_4.gif");
+ sprintf(label1[22], "Ratio_Esummed_ECAL_HCAL_HO_4.gif");
+
+ sprintf(label1[23], "Ratio_Esummed_HF_5.gif");
+ sprintf(label1[24], "Ratio_Esummed_HF_6.gif");
+
+ // REFERENCE FILE
+
+ TDirectory *td = fileDirectory(&f1, "CaloTowersTask");
+ //f1.cd("DQMData/CaloTowersV/CaloTowersTask");
+ //gDirectory->pwd();
+ td->pwd();
+ f1_prof[0] = (TProfile *)td->Get("emean_vs_ieta_E1");
+ f1_prof[1] = (TProfile *)td->Get("emean_vs_ieta_H1");
+ f1_prof[2] = (TProfile *)td->Get("emean_vs_ieta_EH1");
+
+ f1_prof[14] = (TProfile *)td->Get("emean_vs_ieta_E");
+ f1_prof[15] = (TProfile *)td->Get("emean_vs_ieta_H");
+ f1_prof[16] = (TProfile *)td->Get("emean_vs_ieta_EH");
+
+ f1_hist1[0] = (TH1 *)td->Get("CaloTowersTask_number_of_fired_towers_HB");
+ f1_hist1[1] = (TH1 *)td->Get("CaloTowersTask_number_of_fired_towers_HE");
+ f1_hist1[2] = (TH1 *)td->Get("CaloTowersTask_number_of_fired_towers_HF");
+
+ td = fileDirectory(&f1, "PFClusterV");
+ f1_prof[17] = (TProfile *)td->Get("emean_vs_eta_E");
+ f1_prof[18] = (TProfile *)td->Get("emean_vs_eta_H");
+ f1_prof[19] = (TProfile *)td->Get("emean_vs_eta_EH");
+ f1_prof[20] = (TProfile *)td->Get("emean_vs_eta_HF");
+ f1_prof[21] = (TProfile *)td->Get("emean_vs_eta_HO");
+ f1_prof[22] = (TProfile *)td->Get("emean_vs_eta_EHF");
+ f1_prof[23] = (TProfile *)td->Get("emean_vs_eta_EHFO");
+
+ f1_hist1[13] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_0");
+ f1_hist1[14] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_0");
+ f1_hist1[15] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_1");
+ f1_hist1[16] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_1");
+ f1_hist1[17] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_2");
+ f1_hist1[18] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_2");
+ f1_hist1[19] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_3");
+ f1_hist1[20] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_3");
+ f1_hist1[21] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_4");
+ f1_hist1[22] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_4");
+
+ f1_hist1[23] = (TH1 *)td->Get("Ratio_Esummed_HF_5");
+ f1_hist1[24] = (TH1 *)td->Get("Ratio_Esummed_HF_6");
+
+ td = fileDirectory(&f1, "HcalRecHitTask");
+ //f1.cd("DQMData/HcalRecHitsV/HcalRecHitTask");
+ f1_prof[3] = (TProfile *)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
+ f1_prof[4] = (TProfile *)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
+ f1_prof[5] = (TProfile *)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
+
+ f1_prof[9] = (TProfile *)td->Get("HcalRecHitTask_timing_vs_energy_profile_HB");
+ f1_prof[10] = (TProfile *)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HE");
+ f1_prof[11] = (TProfile *)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HF");
+
+ f1_prof[12] = (TProfile *)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HE");
+ f1_prof[13] = (TProfile *)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HB");
+
+ f1_hist1[3] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HB");
+ f1_hist1[4] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HE");
+ f1_hist1[5] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HO");
+ f1_hist1[6] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HF");
+
+ f1_hist1[11] = (TH1 *)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HE");
+ f1_hist1[12] = (TH1 *)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HB");
+
+ td = fileDirectory(&f1, "HcalDigiTask");
+ f1_hist1[7] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HB");
+ f1_hist1[8] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HE");
+ f1_hist1[9] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HO");
+ f1_hist1[10] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HF");
+
+ if (!fastsim) {
+ td = fileDirectory(&f1, "HcalSimHitTask");
+ //f1.cd("DQMData/HcalSimHitsV/HcalSimHitTask");
+ f1_prof[6] = (TProfile *)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_E");
+ f1_prof[7] = (TProfile *)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths");
+ f1_prof[8] = (TProfile *)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_EH");
+ }
+
+ // NEW FILE
+
+ td = fileDirectory(&f2, "CaloTowersTask");
+ //f2.cd("DQMData/CaloTowersV/CaloTowersTask");
+ //gDirectory->pwd();
+ td->pwd();
+ f2_prof[0] = (TProfile *)td->Get("emean_vs_ieta_E1");
+ f2_prof[1] = (TProfile *)td->Get("emean_vs_ieta_H1");
+ f2_prof[2] = (TProfile *)td->Get("emean_vs_ieta_EH1");
+
+ f2_prof[14] = (TProfile *)td->Get("emean_vs_ieta_E");
+ f2_prof[15] = (TProfile *)td->Get("emean_vs_ieta_H");
+ f2_prof[16] = (TProfile *)td->Get("emean_vs_ieta_EH");
+
+ f2_hist1[0] = (TH1 *)td->Get("CaloTowersTask_number_of_fired_towers_HB");
+ f2_hist1[1] = (TH1 *)td->Get("CaloTowersTask_number_of_fired_towers_HE");
+ f2_hist1[2] = (TH1 *)td->Get("CaloTowersTask_number_of_fired_towers_HF");
+
+ td = fileDirectory(&f2, "PFClusterV");
+ f2_prof[17] = (TProfile *)td->Get("emean_vs_eta_E");
+ f2_prof[18] = (TProfile *)td->Get("emean_vs_eta_H");
+ f2_prof[19] = (TProfile *)td->Get("emean_vs_eta_EH");
+ f2_prof[20] = (TProfile *)td->Get("emean_vs_eta_HF");
+ f2_prof[21] = (TProfile *)td->Get("emean_vs_eta_HO");
+ f2_prof[22] = (TProfile *)td->Get("emean_vs_eta_EHF");
+ f2_prof[23] = (TProfile *)td->Get("emean_vs_eta_EHFO");
+
+ f2_hist1[13] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_0");
+ f2_hist1[14] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_0");
+ f2_hist1[15] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_1");
+ f2_hist1[16] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_1");
+ f2_hist1[17] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_2");
+ f2_hist1[18] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_2");
+ f2_hist1[19] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_3");
+ f2_hist1[20] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_3");
+ f2_hist1[21] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_4");
+ f2_hist1[22] = (TH1 *)td->Get("Ratio_Esummed_ECAL_HCAL_HO_4");
+
+ f2_hist1[23] = (TH1 *)td->Get("Ratio_Esummed_HF_5");
+ f2_hist1[24] = (TH1 *)td->Get("Ratio_Esummed_HF_6");
+
+ td = fileDirectory(&f2, "HcalRecHitTask");
+ //f2.cd("DQMData/HcalRecHitsV/HcalRecHitTask");
+ f2_prof[3] = (TProfile *)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
+ f2_prof[4] = (TProfile *)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
+ f2_prof[5] = (TProfile *)td->Get("HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
+
+ f2_prof[9] = (TProfile *)td->Get("HcalRecHitTask_timing_vs_energy_profile_HB");
+ f2_prof[10] = (TProfile *)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HE");
+ f2_prof[11] = (TProfile *)td->Get("HcalRecHitTask_timing_vs_energy_profile_Low_HF");
+
+ f2_prof[12] = (TProfile *)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HE");
+ f2_prof[13] = (TProfile *)td->Get("HcalRecHitTask_Log10Chi2_vs_energy_profile_HB");
+
+ f2_hist1[3] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HB");
+ f2_hist1[4] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HE");
+ f2_hist1[5] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HO");
+ f2_hist1[6] = (TH1 *)td->Get("HcalRecHitTask_energy_of_rechits_HF");
+
+ f2_hist1[11] = (TH1 *)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HE");
+ f2_hist1[12] = (TH1 *)td->Get("HcalRecHitTask_M2Log10Chi2_of_rechits_HB");
+
+ td = fileDirectory(&f2, "HcalDigiTask");
+ f2_hist1[7] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HB");
+ f2_hist1[8] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HE");
+ f2_hist1[9] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HO");
+ f2_hist1[10] = (TH1 *)td->Get("HcalDigiTask_Ndigis_HF");
+
+ if (!fastsim) {
+ td = fileDirectory(&f2, "HcalSimHitTask");
+ //f2.cd("DQMData/HcalSimHitsV/HcalSimHitTask");
+ f2_prof[6] = (TProfile *)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_E");
+ f2_prof[7] = (TProfile *)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths");
+ f2_prof[8] = (TProfile *)td->Get("HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_EH");
+ }
+
+ //Profiles titles
+ f1_prof[0]->GetXaxis()->SetTitle("CaloTowers eE (GeV) vs ieta 1 Tower");
+ f1_prof[1]->GetXaxis()->SetTitle("CaloTowers hE (GeV) vs ieta 1 Tower");
+ f1_prof[2]->GetXaxis()->SetTitle("CaloTowers eE+hE (GeV) vs ieta 1 Tower");
+
+ f1_prof[3]->GetXaxis()->SetTitle("RecHits eE (GeV) vs ieta R = 0.3 Cone");
+ f1_prof[4]->GetXaxis()->SetTitle("RecHits hE (GeV) vs ieta R = 0.3 Cone");
+ f1_prof[5]->GetXaxis()->SetTitle("RecHits eE+hE (GeV) vs ieta R = 0.3 Cone");
+
+ if (!fastsim) {
+ f1_prof[6]->GetXaxis()->SetTitle("SimHits eE (GeV) vs ieta R = 0.3 Cone");
+ f1_prof[7]->GetXaxis()->SetTitle("SimHits hE (GeV) vs ieta R = 0.3 Cone");
+ f1_prof[8]->GetXaxis()->SetTitle("SimHits eE+hE (GeV) vs ieta R = 0.3 Cone");
+ }
+
+ f1_prof[9]->GetXaxis()->SetTitle("HB RecHits timing (ns) vs Energy (GeV)");
+ f1_prof[10]->GetXaxis()->SetTitle("HE RecHits timing (ns) vs Energy (GeV)");
+ f1_prof[11]->GetXaxis()->SetTitle("HF RecHits timing (ns) vs Energy (GeV)");
+
+ f1_prof[12]->GetXaxis()->SetTitle("HE log_10(Chi2) vs Energy (GeV)");
+ f1_prof[13]->GetXaxis()->SetTitle("HB log_10(Chi2) vs Energy (GeV)");
+
+ f1_prof[14]->GetXaxis()->SetTitle("CaloTowers eE Rcone sum (GeV) vs ieta");
+ f1_prof[15]->GetXaxis()->SetTitle("CaloTowers hE Rcone sum (GeV) vs ieta");
+ f1_prof[16]->GetXaxis()->SetTitle("CaloTowers eE+hE Rcone sum (GeV) vs ieta ");
+
+ f1_prof[17]->GetXaxis()->SetTitle("PFClusters eE (GeV) vs eta");
+ f1_prof[18]->GetXaxis()->SetTitle("PFClusters hE (GeV) vs eta");
+ f1_prof[19]->GetXaxis()->SetTitle("PFClusters eE+hE (GeV) vs eta");
+ f1_prof[20]->GetXaxis()->SetTitle("PFClusters hfE (GeV) vs eta");
+ f1_prof[21]->GetXaxis()->SetTitle("PFClusters hoE (GeV) vs eta");
+ f1_prof[22]->GetXaxis()->SetTitle("PFClusters eE+hE+hfE (GeV) vs eta");
+ f1_prof[23]->GetXaxis()->SetTitle("PFClusters eE+hE+hfE+hoE (GeV) vs eta");
+
+ //1D Histos titles
+ f1_hist1[0]->GetXaxis()->SetTitle("Number of HB CaloTowers");
+ f1_hist1[1]->GetXaxis()->SetTitle("Number of HE CaloTowers");
+ f1_hist1[2]->GetXaxis()->SetTitle("Number of HF CaloTowers");
+
+ f1_hist1[3]->GetXaxis()->SetTitle("HB RecHits energy (GeV)");
+ f1_hist1[4]->GetXaxis()->SetTitle("HE RecHits energy (GeV)");
+ f1_hist1[5]->GetXaxis()->SetTitle("HO RecHits energy (GeV)");
+ f1_hist1[6]->GetXaxis()->SetTitle("HF RecHits energy (GeV)");
+
+ f1_hist1[7]->GetXaxis()->SetTitle("N_HB Digis");
+ f1_hist1[8]->GetXaxis()->SetTitle("N_HE Digis");
+ f1_hist1[9]->GetXaxis()->SetTitle("N_H0 Digis");
+ f1_hist1[10]->GetXaxis()->SetTitle("N_HF Digis");
+
+ f1_hist1[11]->GetXaxis()->SetTitle("HE log_10(Chi2)");
+ f1_hist1[12]->GetXaxis()->SetTitle("HB log_10(Chi2)");
+
+ f1_hist1[13]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_0");
+ f1_hist1[14]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL+HO_0");
+ f1_hist1[15]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_1");
+ f1_hist1[16]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL+HO_1");
+ f1_hist1[17]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_2");
+ f1_hist1[18]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL+HO_2");
+ f1_hist1[19]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_3");
+ f1_hist1[20]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL+HO_3");
+ f1_hist1[21]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL_4");
+ f1_hist1[22]->GetXaxis()->SetTitle("Esummed/Egen_ECAL+HCAL+HO_4");
+
+ f1_hist1[23]->GetXaxis()->SetTitle("Esummed/Egen_HF_5");
+ f1_hist1[24]->GetXaxis()->SetTitle("Esummed/Egen_HF_6");
+
+ // CaloTowers 1
+ f1_prof[0]->SetMaximum(20.);
+ f1_prof[1]->SetMaximum(40.);
+ f1_prof[2]->SetMaximum(40.);
+ f1_prof[0]->SetMinimum(0.); // idem
+ f1_prof[1]->SetMinimum(0.);
+ f1_prof[2]->SetMinimum(0.);
+
+ // RecHits R==0.3
+ f1_prof[3]->SetMaximum(30.); // 60 for Phase2, 30 for Run3
+ f1_prof[4]->SetMaximum(60.);
+ f1_prof[5]->SetMaximum(80.); // 100 for Phase2
+ f1_prof[3]->SetMinimum(0.);
+ f1_prof[4]->SetMinimum(0.);
+ f1_prof[5]->SetMinimum(0.);
+
+ if (!fastsim) { // SimHits R=0.3
+ f1_prof[6]->SetMinimum(0.);
+ f1_prof[7]->SetMinimum(0.);
+ f1_prof[8]->SetMinimum(0.);
+ f1_prof[6]->SetMaximum(20.);
+ f1_prof[7]->SetMaximum(50.);
+ f1_prof[8]->SetMaximum(60.);
+ }
+
+ f1_prof[9]->SetMinimum(-25.); // RecHits Timing
+ f1_prof[10]->SetMinimum(-25.);
+ f1_prof[11]->SetMinimum(-25.);
+ f1_prof[9]->SetMaximum(25.);
+ f1_prof[10]->SetMaximum(25.);
+ f1_prof[11]->SetMaximum(25.);
+
+ // CaloTowers R=0.3 added
+ f1_prof[14]->SetMaximum(50.); // 50 for Phase2
+ f1_prof[15]->SetMaximum(60.);
+ f1_prof[16]->SetMaximum(80.); // 80 for Phase2
+ f1_prof[14]->SetMinimum(0.);
+ f1_prof[15]->SetMinimum(0.);
+ f1_prof[16]->SetMinimum(0.);
+
+ f1_prof[9]->GetXaxis()->SetRangeUser(0., 75.);
+ f1_prof[10]->GetXaxis()->SetRangeUser(0., 75.);
+ f1_prof[11]->GetXaxis()->SetRangeUser(0., 75.);
+
+ f1_prof[12]->GetXaxis()->SetRangeUser(0., 50.); // Chi2
+ f1_prof[12]->SetMinimum(-1.0);
+ f1_prof[12]->SetMaximum(1.0);
+
+ f1_prof[13]->GetXaxis()->SetRangeUser(0., 50.); // Chi2
+ f1_prof[13]->SetMinimum(-1.0);
+ f1_prof[13]->SetMaximum(1.0);
+
+ f1_prof[17]->SetMaximum(20.); // PFClusters 1
+ f1_prof[18]->SetMaximum(55.);
+ f1_prof[19]->SetMaximum(55.);
+ f1_prof[17]->SetMinimum(0.); // idem
+ f1_prof[18]->SetMinimum(0.);
+ f1_prof[19]->SetMinimum(0.);
+
+ f1_prof[20]->SetMaximum(55.); // PFClusters 2
+ f1_prof[21]->SetMaximum(1.);
+ f1_prof[22]->SetMaximum(55.);
+ f1_prof[23]->SetMaximum(55.);
+ f1_prof[20]->SetMinimum(0.); // idem
+ f1_prof[21]->SetMinimum(0.);
+ f1_prof[22]->SetMinimum(0.);
+ f1_prof[23]->SetMaximum(70.);
+ f1_prof[23]->SetMinimum(0.);
+
+ // 1D HISTOS
+
+ f1_hist1[0]->GetXaxis()->SetRangeUser(0., 2000.); // N_CaloTowers
+ f2_hist1[0]->GetXaxis()->SetRangeUser(0., 2000.);
+
+ f1_hist1[1]->GetXaxis()->SetRangeUser(0., 500.);
+ f2_hist1[1]->GetXaxis()->SetRangeUser(0., 500.);
+
+ f1_hist1[2]->GetXaxis()->SetRangeUser(0., 500.);
+ f2_hist1[2]->GetXaxis()->SetRangeUser(0., 500.);
+
+ f1_hist1[3]->GetXaxis()->SetRangeUser(0., 100.); // RecHits spectra
+ f2_hist1[3]->GetXaxis()->SetRangeUser(0., 100.);
+
+ f1_hist1[4]->GetXaxis()->SetRangeUser(0., 100.);
+ f2_hist1[4]->GetXaxis()->SetRangeUser(0., 100.);
+
+ f1_hist1[5]->GetXaxis()->SetRangeUser(0., 100.);
+ f2_hist1[5]->GetXaxis()->SetRangeUser(0., 100.);
+
+ f1_hist1[6]->GetXaxis()->SetRangeUser(0., 100.);
+ f2_hist1[6]->GetXaxis()->SetRangeUser(0., 100.);
+
+ f1_hist1[3]->SetMaximum(1.e9);
+ f2_hist1[3]->SetMaximum(1.e9);
+ f1_hist1[4]->SetMaximum(1.e9);
+ f2_hist1[4]->SetMaximum(1.e9);
+ f1_hist1[5]->SetMaximum(1.e8);
+ f1_hist1[6]->SetMaximum(1.e8);
+
+ f1_hist1[7]->GetXaxis()->SetRangeUser(0., 1000); // N_Digis
+ f2_hist1[7]->GetXaxis()->SetRangeUser(0., 1000);
+
+ f1_hist1[8]->GetXaxis()->SetRangeUser(0., 200);
+ f2_hist1[8]->GetXaxis()->SetRangeUser(0., 200);
+
+ f1_hist1[9]->GetXaxis()->SetRangeUser(0., 100);
+ f2_hist1[9]->GetXaxis()->SetRangeUser(0., 100);
+
+ f1_hist1[10]->GetXaxis()->SetRangeUser(0., 3500);
+ f2_hist1[10]->GetXaxis()->SetRangeUser(0., 3500);
+
+ // gStyle->SetErrorX(0);
+
+ // 1D-histo
+
+ for (int i = 0; i < Nhist1; i++) {
+ TCanvas *myc = new TCanvas("myc", "", 800, 600);
+ gStyle->SetOptStat(1111);
+
+ if ((i > 2 && i < 7) || (i >= 11 && i <= 12))
+ myc->SetLogy();
- TCanvas *myc = new TCanvas("myc","",800,600);
+ f1_hist1[i]->SetStats(kTRUE); // stat box
+ f2_hist1[i]->SetStats(kTRUE);
+
+ f1_hist1[i]->SetTitle("");
+ f2_hist1[i]->SetTitle("");
+
+ f1_hist1[i]->SetLineWidth(2);
+ f2_hist1[i]->SetLineWidth(2);
+
+ // diffferent histo colors and styles
+ f1_hist1[i]->SetLineColor(41);
+ f1_hist1[i]->SetLineStyle(1);
+
+ f2_hist1[i]->SetLineColor(43);
+ f2_hist1[i]->SetLineStyle(2);
+
+ //Set maximum to the larger of the two
+ if (f1_hist1[i]->GetMaximum() < f2_hist1[i]->GetMaximum())
+ f1_hist1[i]->SetMaximum(1.05 * f2_hist1[i]->GetMaximum());
+
+ TLegend *leg = new TLegend(0.2, 0.91, 0.6, 0.99, "", "brNDC");
+
+ leg->SetBorderSize(2);
+ // leg->SetFillColor(51); // see new color definition above
+ leg->SetFillStyle(1001); //
+ leg->AddEntry(f1_hist1[i], "CMSSW_" + ref_vers, "l");
+ leg->AddEntry(f2_hist1[i], "CMSSW_" + val_vers, "l");
+
+ TPaveStats *ptstats = new TPaveStats(0.85, 0.86, 0.98, 0.98, "brNDC");
+ ptstats->SetTextColor(41);
+ f1_hist1[i]->GetListOfFunctions()->Add(ptstats);
+ ptstats->SetParent(f1_hist1[i]->GetListOfFunctions());
+ TPaveStats *ptstats2 = new TPaveStats(0.85, 0.74, 0.98, 0.86, "brNDC");
+ ptstats2->SetTextColor(43);
+ f2_hist1[i]->GetListOfFunctions()->Add(ptstats2);
+ ptstats2->SetParent(f2_hist1[i]->GetListOfFunctions());
+
+ f1_hist1[i]->Draw(""); // "stat"
+ f2_hist1[i]->Draw("hist sames");
+
+ leg->Draw();
+
+ myc->SaveAs(label1[i]);
+
+ if (myc)
+ delete myc;
+
+ std::cout << "1D histos " << i << " produced" << std::endl;
+ }
+
+ // Profiles
+ for (int i = 0; i < Nprof; i++) {
+ TCanvas *myc = new TCanvas("myc", "", 800, 600);
bool skipHisto = false;
- if (fastsim && i>=6 && i<=8) skipHisto = true; // SimHits to exclude
+ if (fastsim && i >= 6 && i <= 8)
+ skipHisto = true; // SimHits to exclude
if (!skipHisto) {
- f1_prof[i]->SetStats(kFALSE);
- f2_prof[i]->SetStats(kFALSE);
-
+ f1_prof[i]->SetStats(kFALSE);
+ f2_prof[i]->SetStats(kFALSE);
+
f1_prof[i]->SetTitle("");
f2_prof[i]->SetTitle("");
-
f1_prof[i]->SetLineColor(41);
- f1_prof[i]->SetLineStyle(1);
- f1_prof[i]->SetLineWidth(1);
+ f1_prof[i]->SetLineStyle(1);
+ f1_prof[i]->SetLineWidth(1);
f1_prof[i]->SetMarkerColor(41);
f1_prof[i]->SetMarkerStyle(21);
- f1_prof[i]->SetMarkerSize(1.0);
-
+ f1_prof[i]->SetMarkerSize(1.0);
+
f2_prof[i]->SetLineColor(43);
- f2_prof[i]->SetLineStyle(1);
- f2_prof[i]->SetLineWidth(1);
+ f2_prof[i]->SetLineStyle(1);
+ f2_prof[i]->SetLineWidth(1);
f2_prof[i]->SetMarkerColor(43);
f2_prof[i]->SetMarkerStyle(20);
- f2_prof[i]->SetMarkerSize(0.8);
-
- if(i > 8 && i < 12) { // Timing
- f1_prof[i]->SetMarkerSize(0.1);
- f2_prof[i]->SetMarkerSize(0.3);
+ f2_prof[i]->SetMarkerSize(0.8);
+
+ if (i > 8 && i < 12) { // Timing
+ f1_prof[i]->SetMarkerSize(0.1);
+ f2_prof[i]->SetMarkerSize(0.3);
}
-
+
myc->SetGrid();
-
- if( i <= 8 || i >= 12) { // Other than RecHits timing
- f1_prof[i]->Draw("histpl ");
- f2_prof[i]->Draw("histplsame"); //
- }
- else {
- f1_prof[i]->Draw("pl"); // RecHits Timing
- f2_prof[i]->Draw("pl same"); //
+
+ if (i <= 8 || i >= 12) { // Other than RecHits timing
+ f1_prof[i]->Draw("histpl ");
+ f2_prof[i]->Draw("histplsame"); //
+ } else {
+ f1_prof[i]->Draw("pl"); // RecHits Timing
+ f2_prof[i]->Draw("pl same"); //
}
- f1_prof[i]->GetOption();
- f2_prof[i]->GetOption();
+ f1_prof[i]->GetOption();
+ f2_prof[i]->GetOption();
-
- TLegend *leg = new TLegend(0.40, 0.91, 0.74, 0.99, "","brNDC");
+ TLegend *leg = new TLegend(0.40, 0.91, 0.74, 0.99, "", "brNDC");
leg->SetBorderSize(2);
- leg->SetFillStyle(1001);
- leg->AddEntry(f1_prof[i],"CMSSW_"+ref_vers,"pl");
- leg->AddEntry(f2_prof[i],"CMSSW_"+val_vers,"pl");
-
- leg->Draw("");
-
- myc->SaveAs(labelp[i]);
- }
- if(myc) delete myc;
+ leg->SetFillStyle(1001);
+ leg->AddEntry(f1_prof[i], "CMSSW_" + ref_vers, "pl");
+ leg->AddEntry(f2_prof[i], "CMSSW_" + val_vers, "pl");
- std::cout << "Profile " << i << " produced" << std::endl;
+ leg->Draw("");
+ myc->SaveAs(labelp[i]);
+ }
+ if (myc)
+ delete myc;
+ std::cout << "Profile " << i << " produced" << std::endl;
}
+ // RATIO CaloTower 1
+ TCanvas *myc1 = new TCanvas("myc1", "", 800, 600);
- // RATIO CaloTower 1
-
-
- TCanvas *myc1 = new TCanvas("myc1","",800,600);
-
- TProfile* ratio1 = (TProfile*)f2_prof[2]->Clone();
+ TProfile *ratio1 = (TProfile *)f2_prof[2]->Clone();
ratio1->Divide(f1_prof[2]);
- ratio1->SetMaximum(1.2);
- ratio1->SetMinimum(0.8);
- myc1->SetGrid();
+ ratio1->SetMaximum(1.5);
+ ratio1->SetMinimum(0.5);
+ myc1->SetGrid();
ratio1->Draw("hist pl");
- TLegend *leg1 = new TLegend(0.20, 0.91, 0.70, 0.99, "","brNDC");
+ TLegend *leg1 = new TLegend(0.20, 0.91, 0.70, 0.99, "", "brNDC");
leg1->SetBorderSize(2);
leg1->SetFillStyle(1001);
- leg1->AddEntry(ratio1,"CaloTowers scale (pi50) ratio "+val_vers+"/"+ref_vers+" vs ieta","pl");
+ leg1->AddEntry(ratio1, "CaloTowers scale (pi50) ratio " + val_vers + "/" + ref_vers + " vs ieta", "pl");
leg1->Draw("");
myc1->SaveAs("Ratio.gif");
-
- // RATIO HCAL RecHits in R=0.3
+ // RATIO HCAL RecHits in R=0.3
- TCanvas *myc2 = new TCanvas("myc2","",800,600);
+ TCanvas *myc2 = new TCanvas("myc2", "", 800, 600);
- TProfile* ratio2 = (TProfile*)f2_prof[4]->Clone();
+ TProfile *ratio2 = (TProfile *)f2_prof[4]->Clone();
ratio2->Divide(f1_prof[4]);
- ratio2->SetMaximum(1.2);
- ratio2->SetMinimum(0.8);
- myc2->SetGrid();
+ ratio2->SetMaximum(1.5);
+ ratio2->SetMinimum(0.5);
+ myc2->SetGrid();
ratio2->Draw("hist pl");
- TLegend *leg2 = new TLegend(0.10, 0.91, 0.80, 0.99, "","brNDC");
+ TLegend *leg2 = new TLegend(0.10, 0.91, 0.80, 0.99, "", "brNDC");
leg2->SetBorderSize(2);
leg2->SetFillStyle(1001);
- leg2->AddEntry(ratio2,"HCAL sum ratio "+val_vers+"/"+ref_vers+" vs ieta","pl");
+ leg2->AddEntry(ratio2, "HCAL sum ratio " + val_vers + "/" + ref_vers + " vs ieta", "pl");
leg2->Draw("");
myc2->SaveAs("Ratio_Hcone.gif");
-
- /*
// RATIO CaloTowers H sum in R=0.3
- TCanvas *myc3 = new TCanvas("myc3","",800,600);
+ TCanvas *myc3 = new TCanvas("myc3", "", 800, 600);
- TProfile* ratio3 = (TProfile*)f2_prof[13]->Clone();
- ratio3->Divide(f1_prof[13]);
- ratio3->SetMaximum(1.2);
- ratio3->SetMinimum(0.8);
- myc3->SetGrid();
+ TProfile *ratio3 = (TProfile *)f2_prof[15]->Clone();
+ ratio3->Divide(f1_prof[15]);
+ ratio3->SetMaximum(1.5);
+ ratio3->SetMinimum(0.5);
+ myc3->SetGrid();
ratio3->Draw("hist pl");
- TLegend *leg3 = new TLegend(0.10, 0.91, 0.80, 0.99, "","brNDC");
+ TLegend *leg3 = new TLegend(0.10, 0.91, 0.80, 0.99, "", "brNDC");
leg3->SetBorderSize(2);
leg3->SetFillStyle(1001);
- leg3->AddEntry(ratio3,"CaloTowers HAD in R=0.3 ratio "+val_vers+"/"+ref_vers+" vs ieta","pl");
+ leg3->AddEntry(ratio3, "CaloTowers HAD in R=0.3 ratio " + val_vers + "/" + ref_vers + " vs ieta", "pl");
leg3->Draw("");
myc3->SaveAs("Ratio_CaloTowers_Hcone.gif");
- */
+ // close ROOT files ===========================================
+ //
+ f1.Close();
+ f2.Close();
-
- // close ROOT files ===========================================
- //
- f1.Close() ;
- f2.Close() ;
-
- return ;
-
+ return;
}
-TDirectory* fileDirectory( TDirectory *target, std::string s)
-{
- TDirectory *retval = 0;
-
- // loop over all keys in this directory
- TIter nextkey(target->GetListOfKeys());
- TKey *key, *oldkey=0;
- while((key = (TKey*)nextkey()))
- {
- //keep only the highest cycle number for each key
- if (oldkey && !strcmp(oldkey->GetName(),key->GetName())) continue;
-
- // read object from file
- target->cd();
- TObject *obj = key->ReadObj();
-
- if(obj->IsA()->InheritsFrom(TDirectory::Class()))
- {
- // it's a subdirectory
- //cout << "Found subdirectory " << obj->GetName() << endl;
- if(strcmp(s.c_str(), obj->GetName()) == 0) return (TDirectory*)obj;
-
- if((retval = fileDirectory((TDirectory*)obj, s))) break;
-
- }
- else break;
- }
- return retval;
-}
+TDirectory *fileDirectory(TDirectory *target, std::string s) {
+ TDirectory *retval = 0;
+
+ // loop over all keys in this directory
+ TIter nextkey(target->GetListOfKeys());
+ TKey *key, *oldkey = 0;
+ while ((key = (TKey *)nextkey())) {
+ //keep only the highest cycle number for each key
+ if (oldkey && !strcmp(oldkey->GetName(), key->GetName()))
+ continue;
+
+ // read object from file
+ target->cd();
+ TObject *obj = key->ReadObj();
+ if (obj->IsA()->InheritsFrom(TDirectory::Class())) {
+ // it's a subdirectory
+ //cout << "Found subdirectory " << obj->GetName() << endl;
+ if (strcmp(s.c_str(), obj->GetName()) == 0)
+ return (TDirectory *)obj;
+
+ if ((retval = fileDirectory((TDirectory *)obj, s)))
+ break;
+
+ } else
+ break;
+ }
+ return retval;
+}
diff --git a/Validation/CaloTowers/test/macros/get.py b/Validation/CaloTowers/test/macros/get.py
deleted file mode 100755
index ca0120af0d338..0000000000000
--- a/Validation/CaloTowers/test/macros/get.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sys
-
-def func(var):
- out = var.split('/')
- print (out[27])
- return out[27]
-
-def betterfunc(var):
- ar = var.split(':')
- for x in range (0,len(ar)):
- if(ar[x].find('boost') >= 0):
- out = ar[x]
- out = out.replace('/include','')
- print (out)
- return out
-
-betterfunc(sys.argv[1])
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2017.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2021.html
similarity index 100%
rename from Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2017.html
rename to Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2021.html
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2023.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2023.html
new file mode 100644
index 0000000000000..ea887a9616923
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2023.html
@@ -0,0 +1,128 @@
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+ HB CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HE CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HF CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CaloTower Occupancy
+
+
+
+
+
+
+
+ Ecal CaloTower cells
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2024.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2024.html
new file mode 100644
index 0000000000000..ea887a9616923
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowers2024.html
@@ -0,0 +1,128 @@
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+ HB CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HE CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HF CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CaloTower Occupancy
+
+
+
+
+
+
+
+ Ecal CaloTower cells
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowersPhase2.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowersPhase2.html
new file mode 100644
index 0000000000000..949b3b731381f
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_CaloTowersPhase2.html
@@ -0,0 +1,95 @@
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+ HB CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HF CaloTowers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CaloTower Occupancy
+
+
+
+
+
+
+
+ Ecal CaloTower cells (The bottom three plots will stay empty for Phase2, 27-Sep-2022)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2018.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2018.html
index 943d00ca01ae3..fc59ee6310c3c 100644
--- a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2018.html
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2018.html
@@ -65,10 +65,6 @@
-
-
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2017.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2021.html
similarity index 77%
rename from Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2017.html
rename to Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2021.html
index f38e561778676..cc1483d7512c2 100644
--- a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2017.html
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2021.html
@@ -5,6 +5,8 @@
Occupancy
+
+
@@ -22,6 +24,10 @@
+
+
+
+
@@ -49,17 +55,20 @@
Fraction of Signal in SOI and subequent TS' Over Amplitude if Ampl. is Big
-
-
-
-
-
-
+
+
+
+
+
+
+
Signal Amplitude
+
+
@@ -129,22 +138,39 @@
Trigger Primitive Plots
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+
Amplitudes Versus TS'
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2023.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2023.html
new file mode 100644
index 0000000000000..c320abaf9a360
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2023.html
@@ -0,0 +1,150 @@
+ >>> click on thumbnail to get a full-size plot
+
+
Please note the definition of ieta in the plots below: ieta = ..., -2, -1, 1, 2, ...
+
+
Occupancy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fraction of Signal in SOI and subequent TS' Over Amplitude if Ampl. is Big
+
+
+
+
+
+
+
+
+
Signal Amplitude
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Number Of Amplitudes
+
+
+
+
+
+
+
+
Number Of Digis
+
+
+
+
+
+
+
Trigger Primitive Plots
+
+
+
+
+
+
+
+
+
+
+
+
+
Amplitudes Versus TS'
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2024.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2024.html
new file mode 100644
index 0000000000000..057593471d058
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigis2024.html
@@ -0,0 +1,156 @@
+ >>> click on thumbnail to get a full-size plot
+
+
Please note the definition of ieta in the plots below: ieta = ..., -2, -1, 1, 2, ...
+
+
Occupancy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fraction of Signal in SOI and subequent TS' Over Amplitude if Ampl. is Big
+
+
+
+
+
+
+
+
+
Signal Amplitude
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Number Of Amplitudes
+
+
+
+
+
+
+
+
Number Of Digis
+
+
+
+
+
+
+
Trigger Primitive Plots
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Amplitudes Versus TS'
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigisPhase2.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigisPhase2.html
new file mode 100644
index 0000000000000..c2cfc1a977c27
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_HcalDigisPhase2.html
@@ -0,0 +1,145 @@
+ >>> click on thumbnail to get a full-size plot
+
+
Please note the definition of ieta in the plots below: ieta = ..., -2, -1, 1, 2, ...
+
+
Occupancy
+
+
+
+
+
+
+
+
+
+
Occupancy Maps
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fraction of Signal in SOI and subequent TS' Over Amplitude if Ampl. is Big
+
+
+
+
+
+
+
Signal Amplitude
+
+
+
+
+
+
+
+
+
+
+
+
+
Number Of Amplitudes
+
+
+
+
+
+
+
Number Of Digis
+
+
+
+
+
+
Trigger Primitive Plots
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Amplitudes Versus TS'
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html
index 3be0e974e5423..1bcf236ca266d 100644
--- a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html
@@ -19,6 +19,14 @@ RelVal DATA_SAMPLE samples
+
+
+
+
+
+
+
+
@@ -111,6 +119,14 @@ RelVal DATA_SAMPLE samples
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2017.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html_new
similarity index 94%
rename from Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2017.html
rename to Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html_new
index 5b80b6fb951b8..b80e20e00ec48 100644
--- a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2017.html
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits.html_new
@@ -19,6 +19,14 @@ RelVal DATA_SAMPLE samples
+
+
+
+
+
+
+
+
@@ -203,17 +211,16 @@ RelVal DATA_SAMPLE samples
+
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2018.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2018.html
index b80e20e00ec48..794b372e740cd 100644
--- a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2018.html
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2018.html
@@ -19,14 +19,6 @@ RelVal DATA_SAMPLE samples
-
-
-
-
-
-
-
-
@@ -205,28 +197,20 @@ RelVal DATA_SAMPLE samples
-
-
-
-
-
+
-
-
-
-
+
+
+HBHE Chi2 plots
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2021.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2021.html
new file mode 100644
index 0000000000000..998c547eb87f7
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2021.html
@@ -0,0 +1,280 @@
+ RelVal DATA_SAMPLE samples
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+Mean reconstructed energy as a function of ieta (ring)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits energy distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Cleaned RecHits spectra for each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HBHE Chi2 plots
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Number of RecHits in each subdetector (with default ZeroSuppression)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits Timing as a function of energy in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits timing distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Occupancy as a function of ieta
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Aux Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Severity Level in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL of RecHits in ieta-iphi maps for each depth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2023.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2023.html
new file mode 100644
index 0000000000000..1194bc2f2669d
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2023.html
@@ -0,0 +1,246 @@
+ RelVal DATA_SAMPLE samples
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+Mean reconstructed energy as a function of ieta (ring)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits energy distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Number of RecHits in each subdetector (with default ZeroSuppression)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits Timing as a function of energy in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits timing distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Occupancy as a function of ieta
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Aux Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Severity Level in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL of RecHits in ieta-iphi maps for each depth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2024.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2024.html
new file mode 100644
index 0000000000000..1194bc2f2669d
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHits2024.html
@@ -0,0 +1,246 @@
+ RelVal DATA_SAMPLE samples
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+Mean reconstructed energy as a function of ieta (ring)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits energy distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Number of RecHits in each subdetector (with default ZeroSuppression)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits Timing as a function of energy in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits timing distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Occupancy as a function of ieta
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Aux Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Severity Level in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL of RecHits in ieta-iphi maps for each depth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHitsPhase2.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHitsPhase2.html
new file mode 100644
index 0000000000000..8a3c4abc2d1f8
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_RecHitsPhase2.html
@@ -0,0 +1,175 @@
+ RelVal DATA_SAMPLE samples
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
+Mean reconstructed energy as a function of ieta (ring)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits energy distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+Cleaned RecHits spectra for each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+HBHE Chi2 plots
+
+
+
+
+
+
+
+
+
+
+Number of RecHits in each subdetector (with default ZeroSuppression)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits Timing as a function of energy in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+RecHits timing distribution in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Occupancy as a function of ieta
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Aux Status Word in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HCAL Severity Level in each subdetector
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2017.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2021.html
similarity index 100%
rename from Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2017.html
rename to Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2021.html
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2023.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2023.html
new file mode 100644
index 0000000000000..2dabb2a800502
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2023.html
@@ -0,0 +1,356 @@
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
HCAL SimHits (in all HCAL Subdetectors)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Number of Hits (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Depth Numbers (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Energy (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Energy - Low Energy Zoom (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Log 10 Energy (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Time (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Eta (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SimHits (from SimHitsValidationHcal)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2024.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2024.html
new file mode 100644
index 0000000000000..2dabb2a800502
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_Simhits2024.html
@@ -0,0 +1,356 @@
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
HCAL SimHits (in all HCAL Subdetectors)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Number of Hits (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Depth Numbers (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Energy (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Energy - Low Energy Zoom (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Log 10 Energy (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Time (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
Eta (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SimHits (from SimHitsValidationHcal)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/RelVal_SimhitsPhase2.html b/Validation/CaloTowers/test/macros/html_indices/RelVal_SimhitsPhase2.html
new file mode 100644
index 0000000000000..8f83b1aa95321
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/RelVal_SimhitsPhase2.html
@@ -0,0 +1,299 @@
+
+
+ >>> click on thumbnail to get a full-size plot
+
+
+
HCAL SimHits (in all HCAL Subdetectors)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Number of Hits (by subdetector)
+
+
+
+
+
+
+
+
+
+
Depth Numbers (by subdetector)
+
+
+
+
+
+
+
+
+
+
Energy (by subdetector)
+
+
+
+
+
+
+
+
+
+
Energy - Low Energy Zoom (by subdetector)
+
+
+
+
+
+
+
+
+
+
Log 10 Energy (by subdetector)
+
+
+
+
+
+
+
+
+
+
Time (by subdetector)
+
+
+
+
+
+
+
+
+
+
Eta (by subdetector)
+
+
+
+
+
+
+
+
+
+
+
+
+ SimHits (from SimHitsValidationHcal)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/SinglePiScan.html b/Validation/CaloTowers/test/macros/html_indices/SinglePiScan.html
index 0d861dd2fd3b4..8eaeed2414fd3 100644
--- a/Validation/CaloTowers/test/macros/html_indices/SinglePiScan.html
+++ b/Validation/CaloTowers/test/macros/html_indices/SinglePiScan.html
@@ -30,23 +30,6 @@
-
-
-Plotted in this row is the number of Digis per each subdetector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Plotted in this row is the HCAL subdetectors RecHits energy (mostly noise with single-pion contributin on the right side
Plots ====>>> HB >>> HE >>> HO >>> HF
@@ -79,7 +62,7 @@
Plotted in this row is the RecHits energy collected in R=0.3 : EM, HAD and EM+HAD without HO
-Plots ====>>> Em component >>> Had component (no HO) >>> Total energy (Em+Had) >>> Ratio of Had component
+Plots ====>>> Em component >>> Had component (no HO) >>> Total energy (Em+Had) >>>
@@ -89,33 +72,12 @@
-
-
-
-Plotted in this row is log_10(Chi2)
-Plots ====>>> HB/HE log_10(Chi2) 1D inclusive >>> HB/HE log_10(Chi2) vs energy profile
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Plotted in the row below is EM, HAD, EM+HAD for
-ONE single CaloTower in the event, which is closest to the MC direction of the pion
+Plotted in the row below is the same quantities as above,
+but for ONE single CaloTower in the event, which is closest to the MC direction of the pion
Also added is a plot of the single CaloTower scale ratio (new / previous).
The idea is to avoid any clustering (which masks transition) and to pinpoint each ieta ring in the most simplified and clear way.
@@ -132,11 +94,11 @@
-
+
-Number of CaloTowers in HB, HE and HF (separately)
+Finally: number of CaloTowers in HB, HE and HF (separately)
@@ -146,53 +108,3 @@
-
-Plotted in the row below is summed energy of PFCluster ECAL, HCAL, HBHE, HO energies within a cone of 0.3 w.r.t gen particle
-Plots ====>>> Ecal energy >>> HBHE energy >> HO energy
-
-
-
-
-
-
-
-
-
-
-Plotted in the row below is summed energy of PFCluster HF energy and (ECAL+HCAL+HF+HO) energies.
-Plot ====> HF energy >>> (ECAL+HCAL+HF+HO) energy
-
-
-
-
-
-
-
-
-Plotted in the row below is the Ratio of Esummed/Egen of PFCluster for Barrel { 0<|eta|<0.5 and 0.5<|eta|<1.3 } and HF region { 3.0<|eta|<4.0 and 4.0<|eta|<5.0}
-Plots ====> Ratio of (ECAL+HCAL+HO)/Egen_0 >>> Ratio of (ECAL+HCAL+HO)/Egen_1 >>> Ratio of (HF)/Egen_5 >>> Ratio of (HF)/Egen_6
-
-
-
-
-
-
-
-
-
-
-
-
-Plotted in the row below is the Ratio of Esummed/Egen of PFCluster for Endcap: 1.3<|eta|<2.1 and 2.1<|eta|<2.4 and 2.4<|eta|<3.0
-Plots ===>>> Ratio of (ECAL+HCAL+HO)/Egen_2 >>> Ratio of (ECAL+HCAL+HO)/Egen_3 >>> Ratio of (ECAL+HCAL+HO)/Egen_4
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal.html
index 25fd17874f181..41d4affcff6f2 100644
--- a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal.html
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal.html
@@ -30,11 +30,3 @@ 4) Single Pion Scan
Single Pion Results
- 5) RBX
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelValSimHits.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelValSimHits.html
index 14b54708be403..ed5316174d4f0 100644
--- a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelValSimHits.html
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelValSimHits.html
@@ -3,42 +3,22 @@
1) HcalDigis
2) RecHits
3) CaloTowers
- 4) RBX
-
-
- 5) SimHits
+ 4) SimHits
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_2023.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_2023.html
index e4930c9fd7114..beefd30f12c11 100644
--- a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_2023.html
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_2023.html
@@ -18,10 +18,4 @@ 3) CaloTowers
MinBias CaloTowers plots
- 4) RBX
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_DATA.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_DATA.html
index cd87beb7a4284..39a0bd8fbaf8c 100644
--- a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_DATA.html
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_DATA.html
@@ -12,9 +12,3 @@ 2) CaloTowers
ZeroBias CaloTowers plots
- 3) RBX
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_PileUp.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_PileUp.html
index 99a4656db122d..a39153a89ef67 100644
--- a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_PileUp.html
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_PileUp.html
@@ -15,8 +15,3 @@ 3) CaloTowers
TTbar CaloTowers plots
- 4) RBX
-
-
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_TTB_ZTT.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_TTB_ZTT.html
new file mode 100644
index 0000000000000..4054e84f7cddb
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_TTB_ZTT.html
@@ -0,0 +1,28 @@
+
+
+ 1) HcalDigis
+
+
+ 2) RecHits
+
+
+ 3) CaloTowers
+
+
+
+ 4) SimHits
+
+
+
diff --git a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_onlyStartup.html b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_onlyStartup.html
index 7c5f88f85162b..b9c3614f6b317 100644
--- a/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_onlyStartup.html
+++ b/Validation/CaloTowers/test/macros/html_indices/TopLevelRelVal_onlyStartup.html
@@ -33,12 +33,3 @@ 3) Single Pion Scan
Single Pion Results
- 4) RBX
-
-
diff --git a/Validation/CaloTowers/test/macros/rootlogon.C b/Validation/CaloTowers/test/macros/rootlogon.C
index 116a5e7924e4a..be915c2b8773e 100644
--- a/Validation/CaloTowers/test/macros/rootlogon.C
+++ b/Validation/CaloTowers/test/macros/rootlogon.C
@@ -1,11 +1,9 @@
#include "TSystem.h"
-
#include "rootlogon.h"
+#include "FWCore/FWLite/interface/FWLiteEnabler.h"
-void rootlogon()
-{
- setColors();
-
- gSystem->Load("libFWCoreFWLite.so");
- AutoLibraryLoader::enable();
+void rootlogon() {
+ setColors();
+ gSystem->Load("libFWCoreFWLite.so");
+ FWLiteEnabler::enable();
}
diff --git a/Validation/CaloTowers/test/macros/skProc1_2023.sh b/Validation/CaloTowers/test/macros/skProc1_2023.sh
new file mode 100755
index 0000000000000..76c5b89bd1bf3
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/skProc1_2023.sh
@@ -0,0 +1,4 @@
+
+./RelValHarvest_2023.py -M CMSSW_14_0_0_pre2
+./RelValHarvest_2023.py -M CMSSW_14_0_0_pre1
+
diff --git a/Validation/CaloTowers/test/macros/skProc1_Phase2.sh b/Validation/CaloTowers/test/macros/skProc1_Phase2.sh
new file mode 100755
index 0000000000000..00612c87a2230
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/skProc1_Phase2.sh
@@ -0,0 +1,4 @@
+
+./RelValHarvest_Phase2.py -M CMSSW_14_0_0_pre2
+./RelValHarvest_Phase2.py -M CMSSW_14_0_0_pre1
+
diff --git a/Validation/CaloTowers/test/macros/skProc2_2023.sh b/Validation/CaloTowers/test/macros/skProc2_2023.sh
new file mode 100755
index 0000000000000..933869ac36583
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/skProc2_2023.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+nopu_new="1400pre2_133X_mcRun3_2023_realistic_v3_STD-v1"
+nopu_old="1400pre1_133X_mcRun3_2023_realistic_v3-v1"
+pu_new="1400pre2_PU_133X_mcRun3_2023_realistic_v3_STD_PU-v3"
+pu_old="1400pre1_PU_133X_mcRun3_2023_realistic_v3-v1"
+
+./RunRVMacros_2023.csh $nopu_new $nopu_old
+./RunRVMacros_Pileup2023.csh $pu_new $pu_old
+rsync -av "${nopu_new}_vs_${nopu_old}_RelVal" ykazhyka@lxplus.cern.ch:/eos/project/c/cmsweb/www/hcal-sw-validation/TMP
+rsync -av "${pu_new}_vs_${pu_old}_RelVal_PileUp" ykazhyka@lxplus.cern.ch:/eos/project/c/cmsweb/www/hcal-sw-validation/TMP
diff --git a/Validation/CaloTowers/test/macros/skProc2_2024.sh b/Validation/CaloTowers/test/macros/skProc2_2024.sh
new file mode 100755
index 0000000000000..e44b17667a08b
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/skProc2_2024.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+nopu_new="1400_140X_mcRun3_2024_realistic_v3_STD_2024_noPU-v1"
+nopu_old="1400pre3_140X_mcRun3_2024_realistic_v1_STD_2024_noPU-v1"
+pu_new="1400_140X_mcRun3_2024_realistic_v3_RecoOnly_2024_PU-v1"
+pu_old="1400pre3_PU_140X_mcRun3_2024_realistic_v1_STD_2024_PU-v1"
+
+./RunRVMacros_2024.csh $nopu_new $nopu_old
+./RunRVMacros_Pileup2024.csh $pu_new $pu_old
+rsync -av "${nopu_new}_vs_${nopu_old}_RelVal" aramayis@lxplus.cern.ch:/eos/project/c/cmsweb/www/hcal-sw-validation/TMP
+rsync -av "${pu_new}_vs_${pu_old}_RelVal_PileUp" aramayis@lxplus.cern.ch:/eos/project/c/cmsweb/www/hcal-sw-validation/TMP
diff --git a/Validation/CaloTowers/test/macros/skProc2_Phase2.sh b/Validation/CaloTowers/test/macros/skProc2_Phase2.sh
new file mode 100755
index 0000000000000..a551dddf331cb
--- /dev/null
+++ b/Validation/CaloTowers/test/macros/skProc2_Phase2.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+nopu_new="1400pre2_133X_mcRun4_realistic_v1_STD_2026D98_noPU-v1"
+nopu_old="1400pre1_133X_mcRun4_realistic_v1_2026D98noPU-v1"
+pu_new="1400pre2_PU_133X_mcRun4_realistic_v1_STD_2026D98_PU200-v3"
+pu_old="1400pre1_PU_133X_mcRun4_realistic_v1_2026D98PU200-v1"
+
+./RunRVMacrosPhase2.csh $nopu_new $nopu_old
+./RunRVMacros_PileupPhase2.csh $pu_new $pu_old
+rsync -av "${nopu_new}_vs_${nopu_old}_RelVal" ykazhyka@lxplus.cern.ch:/eos/project/c/cmsweb/www/hcal-sw-validation/TMP
+rsync -av "${pu_new}_vs_${pu_old}_RelVal_PileUp" ykazhyka@lxplus.cern.ch:/eos/project/c/cmsweb/www/hcal-sw-validation/TMP