add crosstalk to test

HEP-FCC · Aug 29, 2024 · 69fdf28 · 69fdf28
1 parent 1d81581
commit 69fdf28
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/RecFCCeeCalorimeter/CMakeLists.txt b/RecFCCeeCalorimeter/CMakeLists.txt
@@ -49,10 +49,4 @@ add_test(NAME FCCeeLAr_benchmarkCorrection
          COMMAND k4run RecFCCeeCalorimeter/tests/options/run_thetamodulemerged_SW_benchmarkCorr.py
          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
-set_test_env(FCCeeLAr_benchmarkCorrection)
-
-add_test(NAME FCCeeLAr_runxtalk
-  COMMAND k4run RecCalorimeter/tests/options/runEcalBarrel_ReconstructionTopoClusters_crosstalk.py
-         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
-set_test_env(FCCeeLAr_runxtalk)
+set_test_env(FCCeeLAr_benchmarkCorrection)
diff --git a/RecFCCeeCalorimeter/tests/options/ALLEGRO_o1_v03_digi_reco.py b/RecFCCeeCalorimeter/tests/options/ALLEGRO_o1_v03_digi_reco.py
@@ -16,7 +16,8 @@
 #
 inputfile = "ALLEGRO_sim_ee_z_qq.root"  # input file produced with ddsim
 Nevts = -1                              # -1 means all events
-addNoise = False                        # add noise or not to the cell energy
+addNoise = True                         # add noise or not to the cell energy
+addCrosstalk = True                     # switch on/off the crosstalk
 dumpGDML = False                        # create GDML file of detector model
 runHCal = True                          # if false, it will produce only ECAL clusters. if true, it will also produce ECAL+HCAL clusters
 
@@ -143,6 +144,12 @@
 from Configurables import CreateCaloCellPositionsFCCee
 from Configurables import CellPositionsECalBarrelModuleThetaSegTool
 from Configurables import CellPositionsECalEndcapTurbineSegTool
+if addCrosstalk:
+    from Configurables import ReadCaloCrosstalkMap
+    # read the crosstalk map
+    readCrosstalkMap = ReadCaloCrosstalkMap("ReadCrosstalkMap",
+                                            fileName="https://fccsw.web.cern.ch/fccsw/filesForSimDigiReco/ALLEGRO/ALLEGRO_o1_v03/xtalk_neighbours_map_ecalB_thetamodulemerged.root",
+                                            OutputLevel=INFO)
 
 # Create cells in ECal barrel (needed if one wants to apply cell calibration,
 # which is not performed by ddsim)
@@ -151,6 +158,8 @@
 createEcalBarrelCells = CreateCaloCells("CreateECalBarrelCells",
                                         doCellCalibration=True,
                                         calibTool=calibEcalBarrel,
+                                        crosstalksTool=readCrosstalkMap,
+                                        addCrosstalk=addCrosstalk,
                                         addCellNoise=False,
                                         filterCellNoise=False,
                                         addPosition=True,