Changeset 1273 in svn for trunk/modules/Calorimeter.h

Timestamp:

Sep 3, 2013, 5:54:56 PM (11 years ago)

Author:

Pavel Demin

Message:

new energy flow

File:

• trunk/modules/Calorimeter.h (modified) (3 diffs)

trunk/modules/Calorimeter.h

@@ -44 +44 @@
   Double_t fTowerEta, fTowerPhi, fTowerEdges[4];
   Double_t fTowerECalEnergy, fTowerHCalEnergy;
-  Double_t fTowerECalNeutralEnergy, fTowerHCalNeutralEnergy;
-  Int_t fTowerPhotonHits, fTowerECalHits, fTowerHCalHits, fTowerAllHits;
-  Int_t fTowerECalTrackHits, fTowerHCalTrackHits, fTowerTrackAllHits;
+  Double_t fTrackECalEnergy, fTrackHCalEnergy;
+  Int_t fTowerTrackHits, fTowerPhotonHits;
 
   TFractionMap fFractionMap; //!
@@ -56 +55 @@
   std::vector < Long64_t > fTowerHits;
 
-  std::vector < Double_t > fECalFractions;
-  std::vector < Double_t > fHCalFractions;
+  std::vector < Double_t > fTowerECalFractions;
+  std::vector < Double_t > fTowerHCalFractions;
+
+  std::vector < Double_t > fTrackECalFractions;
+  std::vector < Double_t > fTrackHCalFractions;
 
   DelphesFormula *fECalResolutionFormula; //!
@@ -74 +76 @@
   TObjArray *fEFlowTowerOutputArray; //!
 
-  TObjArray *fTowerECalArray; //!
-  TIterator *fItTowerECalArray; //!
-
-  TObjArray *fTowerHCalArray; //!
-  TIterator *fItTowerHCalArray; //!
-
   TObjArray *fTowerTrackArray; //!
   TIterator *fItTowerTrackArray; //!
-
-  TObjArray *fTowerECalTrackArray; //!
-  TIterator *fItTowerECalTrackArray; //!
-
-  TObjArray *fTowerHCalTrackArray; //!
-  TIterator *fItTowerHCalTrackArray; //!
 
   void FinalizeTower();