Changes in / [f14bd6a:f42fdd9] in git

Files:

• examples/delphes_card_ATLAS.tcl (modified) (2 diffs)
• examples/delphes_card_ATLAS_PileUp.tcl (modified) (2 diffs)
• examples/delphes_card_CMS.tcl (modified) (1 diff)
• examples/delphes_card_CMS_PileUp.tcl (modified) (1 diff)
• modules/Calorimeter.cc (modified) (6 diffs)
• modules/Calorimeter.h (modified) (1 diff)
• modules/SimpleCalorimeter.cc (modified) (3 diffs)
• modules/SimpleCalorimeter.h (modified) (1 diff)

examples/delphes_card_ATLAS.tcl

@@ -207 +207 @@
   set PhotonOutputArray photons
 
-  set EcalTowerMinEnergy 0.50
-  set HcalTowerMinEnergy 1.00
-
-  set EcalTowerMinSignificance 1.0
-  set HcalTowerMinSignificance 1.0
-  
   set EFlowTrackOutputArray eflowTracks
   set EFlowPhotonOutputArray eflowPhotons
@@ -475 +469 @@
   set OutputArray jets
 
- # scale formula for jets 
-  set ScaleFormula {  1.00  }
-
+ # scale formula for jets
+  set ScaleFormula {1.00}
 }
 

examples/delphes_card_ATLAS_PileUp.tcl

@@ -247 +247 @@
   set TowerOutputArray towers
   set PhotonOutputArray photons
-
-  set EcalTowerMinEnergy 0.50
-  set HcalTowerMinEnergy 1.00
-
-  set EcalTowerMinSignificance 1.0
-  set HcalTowerMinSignificance 1.0
 
   set EFlowTrackOutputArray eflowTracks
@@ -672 +666 @@
 
 #  add Branch TrackMerger/tracks Track Track
-  add Branch Calorimeter/towers Tower Tower
+#  add Branch Calorimeter/towers Tower Tower
 
 #  add Branch Calorimeter/eflowTracks EFlowTrack Track

examples/delphes_card_CMS.tcl

@@ -212 +212 @@
   set PhotonOutputArray photons
 
-  set EcalTowerMinEnergy 0.5
-  set HcalTowerMinEnergy 1.0
-
-  set EcalTowerMinSignificance 1.0
-  set HcalTowerMinSignificance 1.0
-   
   set EFlowTrackOutputArray eflowTracks
   set EFlowPhotonOutputArray eflowPhotons

examples/delphes_card_CMS_PileUp.tcl

@@ -254 +254 @@
   set TowerOutputArray towers
   set PhotonOutputArray photons
-
-  set EcalTowerMinEnergy 0.5
-  set HcalTowerMinEnergy 1.0
-
-  set EcalTowerMinSignificance 1.0
-  set HcalTowerMinSignificance 1.0
 
   set EFlowTrackOutputArray eflowTracks

modules/Calorimeter.cc

@@ -135 +135 @@
   }
 */
-
-  // read min E value for towers to be saved
-  fEcalEnergyMin = GetDouble("EcalTowerMinEnergy", 0.0); 
-  fHcalEnergyMin = GetDouble("HcalTowerMinEnergy", 0.0); 
-  
-  fEcalSigmaMin  = GetDouble("EcalTowerMinSignificance", 0.0); 
-  fHcalSigmaMin  = GetDouble("HcalTowerMinSignificance", 0.0); 
-
- 
   // read resolution formulas
   fECalResolutionFormula->Compile(GetString("ECalResolutionFormula", "0"));
@@ -423 +414 @@
 
   if(!fTower) return;
-//  cout<<"----------------------"<<endl;
-//  cout<<"Finalize Tower"<<endl;
-//  cout<<""<<endl;
-
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
@@ -443 +430 @@
   hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
   hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
-
-  
-  ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
-  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
-
-  ecalEnergy = (ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
-  hcalEnergy = (hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
 
   energy = ecalEnergy + hcalEnergy;
@@ -473 +453 @@
   fTower->Edges[3] = fTowerEdges[3];
 
-  if( energy > 0.0 )
+
+  // fill calorimeter towers
+  if(energy > 0.0)
   {
     if(fTowerPhotonHits > 0 && fTowerTrackHits == 0)
@@ -493 +475 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
+  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
 
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
+  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
 
+  
+  // save ECAL and/or HCAL energy excess as an energy flow tower
   if(ecalEnergy > 0.0)
   {
@@ -513 +497 @@
     fEFlowPhotonOutputArray->Add(tower);
   }
+
   if(hcalEnergy > 0.0)
   {

modules/Calorimeter.h

@@ -54 +54 @@
   Int_t fTowerTrackHits, fTowerPhotonHits;
 
-  Double_t fEcalEnergyMin;
-  Double_t fHcalEnergyMin;
-  
-  Double_t fEcalSigmaMin;
-  Double_t fHcalSigmaMin;
-
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!

modules/SimpleCalorimeter.cc

@@ -129 +129 @@
   }
 */
-
-  // read min E value for towers to be saved
-  fEnergyMin = GetDouble("TowerMinEnergy", 0.0); 
-  fSigmaMin  = GetDouble("TowerMinSignificance", 0.0); 
- 
   // read resolution formulas
   fResolutionFormula->Compile(GetString("ResolutionFormula", "0"));
@@ -389 +384 @@
   time = (fTowerWeightTime < 1.0E-09 ) ? 0 : fTowerTime/fTowerWeightTime;
 
-  sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
-  
-  energy = (energy < fEnergyMin || energy < fSigmaMin*sigma) ? 0 : energy;
-  
   eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
   phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
@@ -414 +405 @@
   // fill energy flow candidates
   energy -= fTrackEnergy;
-  if(energy < fEnergyMin || energy < fSigmaMin*fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy)) energy = 0.0;
+  if(energy < 0.0) energy = 0.0;
    
   // save energy excess as an energy flow tower

modules/SimpleCalorimeter.h

@@ -54 +54 @@
   Int_t fTowerTrackHits, fTowerPhotonHits;
 
-  Double_t fEnergyMin;
-  Double_t fSigmaMin;
-
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!