Changeset 82575a3 in git for modules/Calorimeter.h

Timestamp:

Apr 16, 2014, 5:17:35 PM (10 years ago)

Author:

mselvaggi <mselvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ab16005

Parents:

9687203

Message:

added simplecalo

File:

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

modules/Calorimeter.h

@@ -38 +38 @@
 private:
 
-  typedef std::map< Long64_t, Double_t > TFractionMap; //!
+  typedef std::map< Long64_t, std::pair< Double_t, Double_t > > TFractionMap; //!
   typedef std::map< Double_t, std::set< Double_t > > TBinMap; //!
 
   Candidate *fTower;
   Double_t fTowerEta, fTowerPhi, fTowerEdges[4];
-  Double_t fTowerEnergy;
-  Double_t fTrackEnergy;
+  Double_t fTowerECalEnergy, fTowerHCalEnergy;
+  Double_t fTrackECalEnergy, fTrackHCalEnergy;
   
-  Double_t fTowerTime;
-  Double_t fTrackTime;
+  Double_t fTowerECalTime, fTowerHCalTime;
+  Double_t fTrackECalTime, fTrackHCalTime;
    
-  Double_t fTowerWeightTime;
-  Double_t fTrackWeightTime;
+  Double_t fTowerECalWeightTime, fTowerHCalWeightTime;
+  Double_t fTrackECalWeightTime, fTrackHCalWeightTime;
   
   Int_t fTowerTrackHits, fTowerPhotonHits;
@@ -62 +62 @@
   std::vector < Long64_t > fTowerHits;
 
-  std::vector < Double_t > fTowerFractions;
-  
-  std::vector < Double_t > fTrackFractions;
- 
-  DelphesFormula *fResolutionFormula; //!
- 
+  std::vector < Double_t > fTowerECalFractions;
+  std::vector < Double_t > fTowerHCalFractions;
+
+  std::vector < Double_t > fTrackECalFractions;
+  std::vector < Double_t > fTrackHCalFractions;
+
+  DelphesFormula *fECalResolutionFormula; //!
+  DelphesFormula *fHCalResolutionFormula; //!
+
   TIterator *fItParticleInputArray; //!
   TIterator *fItTrackInputArray; //!
@@ -75 +78 @@
 
   TObjArray *fTowerOutputArray; //!
+  TObjArray *fPhotonOutputArray; //!
  
-  TObjArray *fEFlowTowerOutputArray; //!
- 
+  TObjArray *fEFlowTrackOutputArray; //!
+  TObjArray *fEFlowPhotonOutputArray; //!
+  TObjArray *fEFlowNeutralHadronOutputArray; //!
+
   TObjArray *fTowerTrackArray; //!
   TIterator *fItTowerTrackArray; //!