Add possibility to relax time cut for cell with high energy eta direct neighbors in layer 2

Add possibility to relax time cut for cell with high energy eta direct neighbors in layer 2

Calorimeter/CaloRec/python/CaloClusterTopoGetter.py

@@ -371,10 +371,12 @@ class CaloClusterTopoGetter ( Configured )  :
         TopoMaker.XTalkEM2 = jobproperties.CaloTopoClusterFlags.xtalkEM2()
         TopoMaker.XTalkEM2n = jobproperties.CaloTopoClusterFlags.xtalkEM2n()
         TopoMaker.XTalkEM3 = jobproperties.CaloTopoClusterFlags.xtalkEM3()
+        TopoMaker.XTalkEMEta = jobproperties.CaloTopoClusterFlags.xtalkEMEta()
         TopoMaker.XTalkDeltaT = jobproperties.CaloTopoClusterFlags.xtalkDeltaT()
         TopoMaker.XTalk2Eratio1 = jobproperties.CaloTopoClusterFlags.xtalk2Eratio1()
         TopoMaker.XTalk2Eratio2 = jobproperties.CaloTopoClusterFlags.xtalk2Eratio2()
         TopoMaker.XTalk3Eratio  = jobproperties.CaloTopoClusterFlags.xtalk3Eratio()
+        TopoMaker.XTalkEtaEratio  = jobproperties.CaloTopoClusterFlags.xtalkEtaEratio()
 
         # note E or AbsE 
         #

Calorimeter/CaloRec/python/CaloConfigFlags.py

@@ -33,10 +33,12 @@ def createCaloConfigFlags():
     ccf.addFlag("Calo.TopoCluster.xtalkEM2", False)
     ccf.addFlag("Calo.TopoCluster.xtalkEM2n", False)
     ccf.addFlag("Calo.TopoCluster.xtalkEM3", False)
+    ccf.addFlag("Calo.TopoCluster.xtalkEMEta", False)
     ccf.addFlag("Calo.TopoCluster.xtalkDeltaT", 15.0)
     ccf.addFlag("Calo.TopoCluster.xtalk2Eratio1", 4.)
     ccf.addFlag("Calo.TopoCluster.xtalk2Eratio2", 25.)
     ccf.addFlag("Calo.TopoCluster.xtalk3Eratio", 10.)
+    ccf.addFlag("Calo.TopoCluster.xtalkEtaEratio", 4.)
     ccf.addFlag("Calo.TopoCluster.writeExtendedClusterMoments", True)
     ccf.addFlag("Calo.TopoCluster.CalibrationHitDecorationName","calclus_NLeadingTruthParticleBarcodeEnergyPairs")
     ccf.addFlag("Calo.TopoCluster.addCalibrationHitDecoration",False)

Calorimeter/CaloRec/python/CaloTopoClusterConfig.py

@@ -258,10 +258,12 @@ def CaloTopoClusterToolCfg(flags, cellsname):
     TopoMaker.XTalkEM2 = flags.Calo.TopoCluster.xtalkEM2
     TopoMaker.XTalkEM2n = flags.Calo.TopoCluster.xtalkEM2n
     TopoMaker.XTalkEM3 = flags.Calo.TopoCluster.xtalkEM3
+    TopoMaker.XTalkEMEta = flags.Calo.TopoCluster.xtalkEMEta
     TopoMaker.XTalkDeltaT = flags.Calo.TopoCluster.xtalkDeltaT
     TopoMaker.XTalk2Eratio1 = flags.Calo.TopoCluster.xtalk2Eratio1
     TopoMaker.XTalk2Eratio2 = flags.Calo.TopoCluster.xtalk2Eratio2
     TopoMaker.XTalk3Eratio = flags.Calo.TopoCluster.xtalk3Eratio
+    TopoMaker.XTalkEtaEratio = flags.Calo.TopoCluster.xtalkEtaEratio
     
     # note E or AbsE
     #

Calorimeter/CaloRec/python/CaloTopoClusterFlags.py

@@ -160,6 +160,13 @@ class xtalkEM3(JobProperty):
     allowedTypes=['bool']
     StoredValue=False
 
+class xtalkEMEta(JobProperty):
+    """
+    """
+    statusOn=True
+    allowedTypes=['bool']
+    StoredValue=False
+
 class xtalkDeltaT(JobProperty):
     """
     """
@@ -188,6 +195,13 @@ class xtalk3Eratio(JobProperty):
     allowedTypes=['float']
     StoredValue=10.
 
+class xtalkEtaEratio(JobProperty):
+    """
+    """
+    statusOn=True
+    allowedTypes=['float']
+    StoredValue=4.
+
 
 # add the flags container to the top container 
 jobproperties.add_Container(CaloTopoClusterFlags)
@@ -216,10 +230,12 @@ list_jobproperties = [
     ,xtalkEM2
     ,xtalkEM2n
     ,xtalkEM3
+    ,xtalkEMEta
     ,xtalkDeltaT
     ,xtalk2Eratio1
     ,xtalk2Eratio2
     ,xtalk3Eratio
+    ,xtalkEtaEratio
     ]
 
 for i in list_jobproperties:

Calorimeter/CaloRec/src/CaloTopoClusterMaker.cxx

@@ -65,6 +65,7 @@ CaloTopoClusterMaker::CaloTopoClusterMaker(const std::string& type,
     m_xtalk2Eratio1                    ( 4.),
     m_xtalk2Eratio2                    ( 25.),
     m_xtalk3Eratio                     ( 10.),
+    m_xtalkEtaEratio                   (4.),
     m_neighborOption                   ("super3D"),
     m_nOption                          (LArNeighbours::super3D),
     m_restrictHECIWandFCalNeighbors    (false),
@@ -81,6 +82,7 @@ CaloTopoClusterMaker::CaloTopoClusterMaker(const std::string& type,
     m_xtalkEM2                         (false),
     m_xtalkEM2n                        (false),
     m_xtalkEM3                         (false),
+    m_xtalkEMEta                       (false),
     m_minSampling                      (0),
     m_maxSampling                      (0),
     m_hashMin                          (999999),
@@ -122,6 +124,8 @@ CaloTopoClusterMaker::CaloTopoClusterMaker(const std::string& type,
   declareProperty("UseTimeCutUpperLimit",m_useTimeCutUpperLimit);
   //relax time window (if timing is used) in EM2 when xTalk is present
   declareProperty("XTalkEM2",m_xtalkEM2);
+  //relax time window (if timing is used) in EM2 Eta directionwhen xTalk is present
+  declareProperty("XTalkEMEta",m_xtalkEMEta);
   //relax time window (if timing is used) in EM2 when xTalk is present also for 2nd phi neighbors (if XTalkEM2 is also set)
   declareProperty("XTalkEM2n",m_xtalkEM2n);
   //relax time window (if timing is used) in EM3 when xTalk is present for layer 3 neighbor of high energy layer 2 cells
@@ -134,6 +138,8 @@ CaloTopoClusterMaker::CaloTopoClusterMaker(const std::string& type,
   declareProperty("XTalk2Eratio2",m_xtalk2Eratio2);
   //Eratio for previous sampling neighbor in layer 3
   declareProperty("XTalk3Eratio",m_xtalk3Eratio);
+  //Eratio for cross-talk in eta layer 2
+  declareProperty("XTalkEtaEratio",m_xtalkEtaEratio);
 
   // Neighbor cuts are in E or Abs E
   declareProperty("NeighborCutsInAbsE",m_neighborCutsInAbsE);
@@ -753,6 +759,29 @@ inline bool CaloTopoClusterMaker::passCellTimeCut(const CaloCell* pCell, const C
 	}        // loop over first neighbors
       }          // special case for layer 2
 
+      // check cross talk in eta
+      if ( m_xtalkEMEta && (!isInTime) && (pCell->energy() > 0 && (sam == CaloSampling::EMB2 || (sam == CaloSampling::EME2 && std::abs(pCell->eta()) < 2.5)))) {
+          IdentifierHash hashid = pCell->caloDDE()->calo_hash();
+          std::vector<IdentifierHash> theNeighbors;
+          LArNeighbours::neighbourOption opt = (LArNeighbours::neighbourOption)(((int)LArNeighbours::prevInEta)|((int)LArNeighbours::nextInEta));
+          m_calo_id->get_neighbours(hashid,opt,theNeighbors);
+          for (IdentifierHash nId : theNeighbors) {
+            const CaloCell * pNCell = cellColl->findCell(nId);
+            if ( pNCell ) {
+                if ( pNCell->energy() > m_xtalkEtaEratio*pCell->energy() ) {
+                 if ( (!(pNCell->provenance() & pmask)) || std::abs(pNCell->time()) < m_seedThresholdOnTAbs) {
+                    isInTime = ((pCell->time() > -m_seedThresholdOnTAbs) && (pCell->time() < m_seedThresholdOnTAbs + m_xtalkDeltaT));
+                    if ( isInTime ) {
+                     // exit after first phi neighbour in case that already made
+                     // the time-cut pass
+                     break;
+                    }
+                 }
+                }
+            }
+          }
+      }
+
       // relax also time constraint for EMB3 and EME2_OW
       if ( m_xtalkEM3 && (!isInTime) && (pCell->energy() > 0 && (sam == CaloSampling::EMB3 || (sam == CaloSampling::EME3 && std::abs(pCell->eta()) < 2.5)))) {
          // check previous sampling cell, should be >10 times more (TBC)

Calorimeter/CaloRec/src/CaloTopoClusterMaker.h

@@ -152,6 +152,10 @@ private:
     *  cut on Eneighbor/E to revover out of time layer 3cell close to energetic previous sampling neighbor */
    float m_xtalk3Eratio;
 
+   /**
+    *  cut on Eneighbor/E to revover out of time layer 2 cell close in eta to energetic neighor cell */
+   float m_xtalkEtaEratio;
+
 
   /** @brief Key of the CaloNoise Conditions data object. Typical values 
       are '"electronicNoise', 'pileupNoise', or '"totalNoise' (default) */
@@ -283,6 +287,12 @@ private:
    */
   bool m_xtalkEM3;
 
+  /**
+   
+    * if set to true, the time window is softened in the EMB2 and EME2_OW due to xtalk from direct neighbour cells in eta
+    */
+  bool m_xtalkEMEta;
+
   /** 
    * @brief vector of names of the calorimeter samplings to consider
    * for seeds.