Merge pull request #18 from dasphy/tli-clustering-new-readout

update sliding window clustering FCCee with k4geo
BrieucF · Feb 9, 2024 · 7e03832 · 7e03832
2 parents 2e50a15 + 5f755fa
commit 7e03832
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/FCCSW_ecal/run_thetamodulemerged.py b/FCCSW_ecal/run_thetamodulemerged.py
@@ -3,8 +3,8 @@
 from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import PodioOutput
 from Configurables import CorrectCaloClusters
-from Configurables import CreateCaloClustersSlidingWindow
-from Configurables import CaloTowerTool
+from Configurables import CreateCaloClustersSlidingWindowFCCee
+from Configurables import CaloTowerToolFCCee
 from Configurables import CreateEmptyCaloCellsCollection
 from Configurables import CreateCaloCellPositionsFCCee
 from Configurables import CellPositionsECalBarrelModuleThetaSegTool
@@ -401,11 +401,9 @@
 createemptycells = CreateEmptyCaloCellsCollection("CreateEmptyCaloCells")
 createemptycells.cells.Path = "emptyCaloCells"
 
-# Produce sliding window clusters
-towers = CaloTowerTool("towers",
-                       deltaEtaTower=0.01, deltaPhiTower=2*_pi/768,
-                       radiusForPosition=2160 + 40 / 2.0,
-                       # ecalBarrelReadoutName = ecalBarrelReadoutNamePhiEta,
+# PRODUCE SLIDING WINDOW CLUSTERS
+towers = CaloTowerToolFCCee("towers",
+                       deltaThetaTower = 0.009817477, deltaPhiTower = 2*2*_pi/1536.,
                        ecalBarrelReadoutName=ecalBarrelReadoutName,
                        ecalEndcapReadoutName=ecalEndcapReadoutName,
                        ecalFwdReadoutName="",
@@ -414,7 +412,7 @@
                        hcalEndcapReadoutName="",
                        hcalFwdReadoutName="",
                        OutputLevel=INFO)
-towers.ecalBarrelCells.Path = ecalBarrelCellsName
+towers.ecalBarrelCells.Path = ecalBarrelPositionedCellsName
 towers.ecalEndcapCells.Path = "ECalEndcapCells"
 towers.ecalFwdCells.Path = "emptyCaloCells"
 
@@ -424,23 +422,23 @@
 towers.hcalFwdCells.Path = "emptyCaloCells"
 
 # Cluster variables
-windE = 9
+windT = 9
 windP = 17
-posE = 5
+posT = 5
 posP = 11
-dupE = 7
+dupT = 7
 dupP = 13
-finE = 9
+finT = 9
 finP = 17
 # Minimal energy to create a cluster in GeV (FCC-ee detectors have to reconstruct low energy particles)
 threshold = 0.040
 
-createClusters = CreateCaloClustersSlidingWindow("CreateClusters",
+createClusters = CreateCaloClustersSlidingWindowFCCee("CreateClusters",
                                                  towerTool=towers,
-                                                 nEtaWindow=windE, nPhiWindow=windP,
-                                                 nEtaPosition=posE, nPhiPosition=posP,
-                                                 nEtaDuplicates=dupE, nPhiDuplicates=dupP,
-                                                 nEtaFinal=finE, nPhiFinal=finP,
+                                                 nThetaWindow=windT, nPhiWindow=windP,
+                                                 nThetaPosition=posT, nPhiPosition=posP,
+                                                 nThetaDuplicates=dupT, nPhiDuplicates=dupP,
+                                                 nThetaFinal=finT, nPhiFinal=finP,
                                                  energyThreshold=threshold,
                                                  energySharingCorrection=False,
                                                  attachCells=True,
@@ -580,7 +578,7 @@
     out.outputCommands = ["keep *", "drop HCal*", "drop emptyCaloCells"]
 
 # out.filename = "root/output_fullCalo_SimAndDigi_withTopoCluster_MagneticField_"+str(magneticField)+"_pMin_"+str(momentum*1000)+"_MeV"+"_ThetaMinMax_"+str(thetaMin)+"_"+str(thetaMax)+"_pdgId_"+str(pdgCode)+"_pythia"+str(use_pythia)+"_Noise"+str(addNoise)+".root"
-out.filename = "./root_merge/output_evts_"+str(Nevts)+"_pdg_"+str(pdgCode)+"_"+str(momentum)+"_GeV"+"_ThetaMinMax_"+str(thetaMin)+"_"+str(
+out.filename = "./root/output_evts_"+str(Nevts)+"_pdg_"+str(pdgCode)+"_"+str(momentum)+"_GeV"+"_ThetaMinMax_"+str(thetaMin)+"_"+str(
     thetaMax)+"_PhiMinMax_"+str(phiMin)+"_"+str(phiMax)+"_MagneticField_"+str(magneticField)+"_Noise"+str(addNoise)+".root"
 
 # CPU information
@@ -624,9 +622,9 @@
     ]
 TopAlg += [
     createemptycells,
-    # createClusters,
-    # createEcalBarrelPositionedCaloClusterCells,
-    # correctCaloClusters,
+    createClusters,
+    createEcalBarrelPositionedCaloClusterCells,
+    correctCaloClusters,
     createTopoClusters,
     createEcalBarrelPositionedCaloTopoClusterCells,
     correctCaloTopoClusters,