Merge pull request cms-sw#43953 from abdoulline/HCAL_RelVal_update_el9

HCAL proprietary RelVal machinery update
artlbv · Mar 20, 2024 · 5a810f4 · 5a810f4
2 parents 47ae9ae + fb1e348
commit 5a810f4
Show file tree

Hide file tree

Showing 68 changed files with 30,824 additions and 8,295 deletions.
diff --git a/Validation/CaloTowers/test/macros/CombinedCaloTowers.C b/Validation/CaloTowers/test/macros/CombinedCaloTowers.C
diff --git a/Validation/CaloTowers/test/macros/InputRelVal.json-2023-12July2023 b/Validation/CaloTowers/test/macros/InputRelVal.json-2023-12July2023
diff --git a/...n/CaloTowers/test/macros/InputRelVal.json → .../macros/InputRelVal.json-phase2-01Dec2021 b/...n/CaloTowers/test/macros/InputRelVal.json → .../macros/InputRelVal.json-phase2-01Dec2021
diff --git a/Validation/CaloTowers/test/macros/InputRelVal_High.txt b/Validation/CaloTowers/test/macros/InputRelVal_High.txt
diff --git a/Validation/CaloTowers/test/macros/InputRelVal_Low.txt b/Validation/CaloTowers/test/macros/InputRelVal_Low.txt
diff --git a/Validation/CaloTowers/test/macros/InputRelVal_Medium.txt b/Validation/CaloTowers/test/macros/InputRelVal_Medium.txt
diff --git a/Validation/CaloTowers/test/macros/InputRelVal_Pileup.txt b/Validation/CaloTowers/test/macros/InputRelVal_Pileup.txt
diff --git a/Validation/CaloTowers/test/macros/InputRelVal_SimHits.txt b/Validation/CaloTowers/test/macros/InputRelVal_SimHits.txt
diff --git a/Validation/CaloTowers/test/macros/Makefile b/Validation/CaloTowers/test/macros/Makefile
@@ -1,11 +1,13 @@
-GCC=g++ -g `root-config --cflags --glibs` $< -o $@
 
+PYTHON_INCLUDE = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/python3/3.9.14-8e02587b42992e07ed46b00eca9dfc3a/include/python3.9/
+PYTHON_LIB     = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/python3/3.9.14-8e02587b42992e07ed46b00eca9dfc3a/lib
+BOOST_INC      = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/boost/1.80.0-e4b2127ad40e46379cea2f9087beeda8/include
+BOOST_LIB      = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/boost/1.80.0-e4b2127ad40e46379cea2f9087beeda8/lib
 
-all : singlePi.exe RelValMacro.so
+TARGET = RelValMacro_ext
 
-singlePi.exe : SinglePi.C
-	$(GCC)
+$(TARGET).so: $(TARGET).o
+	g++ -shared -Wl,--export-dynamic $(TARGET).o -L$(BOOST_LIB) -lboost_python39 -L${PYTHON_LIB} -lpython3.9 -o $(TARGET).so -g `root-config --cflags --glibs`
+$(TARGET).o: $(TARGET).C
+	g++ -I$(PYTHON_INCLUDE) -I$(BOOST_INC) -fPIC -c $(TARGET).C  -g `root-config --cflags --glibs`
 
-RelValMacro.so : RelValMacro.C
-	$(eval tpypath := $(shell python3 get.py '$(CMSSW_FWLITE_INCLUDE_PATH)'))
-	g++ -fPIC -shared RelValMacro.C -o RelValMacro.so -I $(tpypath)/include/ -I /cvmfs/cms.cern.ch/slc6_amd64_gcc491/external/python/2.7.6-eccfad/include/python2.7 -L /cvmfs/cms.cern.ch/slc6_amd64_gcc491/external/python/2.7.6-eccfad/lib -lpython2.7 -L $(tpypath)/lib -lboost_python -g `root-config --cflags --glibs`
diff --git a/Validation/CaloTowers/test/macros/MinBias/MinBias.csh b/Validation/CaloTowers/test/macros/MinBias/MinBias.csh
diff --git a/Validation/CaloTowers/test/macros/MinBias/MinBiasDigis.C b/Validation/CaloTowers/test/macros/MinBias/MinBiasDigis.C
diff --git a/Validation/CaloTowers/test/macros/MinBias/MinBiasDigis.csh b/Validation/CaloTowers/test/macros/MinBias/MinBiasDigis.csh