Changeset fc6300d in git

Timestamp:

Jun 8, 2015, 2:22:11 PM (9 years ago)

Author:

Michele Selvaggi <selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9c491e1

Parents:

e8070b6

Message:

added isEcal flag to simple calorimeter and fill Eem and Ehad variables accordingly (answer to #639)

Files:

• cards/delphes_card_FCC_basic.tcl (modified) (2 diffs)
• cards/delphes_card_LHCb.tcl (modified) (2 diffs)
• modules/SimpleCalorimeter.cc (modified) (3 diffs)
• modules/SimpleCalorimeter.h (modified) (2 diffs)

cards/delphes_card_FCC_basic.tcl

@@ -226 +226 @@
   set EFlowTowerOutputArray eflowPhotons
 
+  set IsEcal true 
+ 
   set EnergyMin 0.5
   set EnergySignificanceMin 1.0
@@ -290 +292 @@
   set EFlowTowerOutputArray eflowNeutralHadrons
 
+  set IsEcal false 
+ 
   set EnergyMin 1.0
   set EnergySignificanceMin 1.0

cards/delphes_card_LHCb.tcl

@@ -223 +223 @@
   set TowerOutputArray ecalTowers
   set EFlowTowerOutputArray eflowPhotons
+
+  set IsEcal true
 
   set EnergyMin 0.0
@@ -303 +305 @@
   set TowerOutputArray hcalTowers
   set EFlowTowerOutputArray eflowNeutralHadrons
+
+  set IsEcal false 
 
   set EnergyMin 0.0

modules/SimpleCalorimeter.cc

@@ -149 +149 @@
 
   fEnergySignificanceMin = GetDouble("EnergySignificanceMin", 0.0);
+
+  // flag that says if current calo is Ecal of Hcal (will then fill correct values of Eem and Ehad)
+  fIsEcal = GetBool("IsEcal", false);
 
   // switch on or off the dithering of the center of calorimeter towers
@@ -425 +428 @@
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
 
+  fTower->Eem = (!fIsEcal) ? 0 : energy;
+  fTower->Ehad = (fIsEcal) ? 0 : energy; 
+
   fTower->Edges[0] = fTowerEdges[0];
   fTower->Edges[1] = fTowerEdges[1];
@@ -447 +453 @@
     pt = energy / TMath::CosH(eta);
 
+    tower->Eem = (!fIsEcal) ? 0 : energy;
+    tower->Ehad = (fIsEcal) ? 0 : energy; 
+
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
     fEFlowTowerOutputArray->Add(tower);

modules/SimpleCalorimeter.h

@@ +1 @@
+
 /*
  *  Delphes: a framework for fast simulation of a generic collider experiment
@@ -74 +75 @@
   Bool_t fSmearTowerCenter;
 
+  Bool_t fIsEcal; //! 
+
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!