Changeset 9da65a5 in git for modules

Timestamp:

Oct 8, 2015, 4:22:02 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

df636c74

Parents:

cdeea24

Message:

fix ecalEnergy and hcalEnergy in Calorimeter

File:

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

modules/Calorimeter.cc

@@ -404 +404 @@
       }
 
-      if(fECalTrackFractions[number] > 1.0E-9 && fHCalTrackFractions[number] < 1.0E-9 )
+      if(fECalTrackFractions[number] > 1.0E-9 && fHCalTrackFractions[number] < 1.0E-9)
       {
         ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
@@ -418 +418 @@
         }
       }
-      else if(fECalTrackFractions[number] < 1.0E-9 && fHCalTrackFractions[number] > 1.0E-9 )
+      else if(fECalTrackFractions[number] < 1.0E-9 && fHCalTrackFractions[number] > 1.0E-9)
       {
         hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
@@ -432 +432 @@
         }
       }
+      else if(fECalTrackFractions[number] < 1.0E-9 && fHCalTrackFractions[number] < 1.0E-9)
+      {
+        fEFlowTrackOutputArray->Add(track);
+      }
 
       continue;
@@ -564 +568 @@
 
     track->Momentum *= ecalEnergy/fECalTrackEnergy[0];
-    ecalEnergy = 0.0;
 
     fEFlowTrackOutputArray->Add(track);
@@ -587 +590 @@
 
     track->Momentum *= hcalEnergy/fHCalTrackEnergy[0];
-    hcalEnergy = 0.0;
 
     fEFlowTrackOutputArray->Add(track);
@@ -602 +604 @@
   }
 
+  if(fECalTowerTrackArray[0]->GetEntriesFast() > 0) ecalEnergy = 0.0;
+  if(fHCalTowerTrackArray[0]->GetEntriesFast() > 0) hcalEnergy = 0.0;
+
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);