Changes in modules/Calorimeter.cc [b443089:01f457a] in git

File:

• modules/Calorimeter.cc (modified) (6 diffs)

modules/Calorimeter.cc

@@ -153 +153 @@
   }
 */
+
+  // 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"));
@@ -432 +441 @@
 
   if(!fTower) return;
+//  cout<<"----------------------"<<endl;
+//  cout<<"Finalize Tower"<<endl;
+//  cout<<""<<endl;
+
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
@@ -448 +461 @@
   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;
@@ -471 +491 @@
   fTower->Edges[3] = fTowerEdges[3];
 
-
-  // fill calorimeter towers
-  if(energy > 0.0)
+  if( energy > 0.0 )
   {
     if(fTowerPhotonHits > 0 && fTowerTrackHits == 0)
@@ -493 +511 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
+  if(ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
 
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
+  if(hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
 
-  
-  // save ECAL and/or HCAL energy excess as an energy flow tower
   if(ecalEnergy > 0.0)
   {
@@ -515 +531 @@
     fEFlowPhotonOutputArray->Add(tower);
   }
-
   if(hcalEnergy > 0.0)
   {