Changeset 1235 in svn for trunk/modules

Timestamp:

Jul 22, 2013, 10:00:23 PM (11 years ago)

Author:

Pavel Demin

Message:

new energy flow that compiles

Location:

trunk/modules

Files:

• Calorimeter.cc (modified) (9 diffs)
• Calorimeter.h (modified) (2 diffs)

trunk/modules/Calorimeter.cc

@@ -45 +45 @@
   fTowerECalArray(0), fItTowerECalArray(0),
   fTowerHCalArray(0), fItTowerHCalArray(0),
+  fTowerTrackArray(0), fItTowerTrackArray(0),
   fTowerECalTrackArray(0), fItTowerECalTrackArray(0),
   fTowerHCalTrackArray(0), fItTowerHCalTrackArray(0)
@@ -56 +57 @@
   fItTowerHCalArray = fTowerHCalArray->MakeIterator();
 
+  fTowerTrackArray = new TObjArray;
+  fItTowerTrackArray = fTowerTrackArray->MakeIterator();
   fTowerECalTrackArray = new TObjArray;
   fItTowerECalTrackArray = fTowerECalTrackArray->MakeIterator();
@@ -74 +77 @@
   if(fItTowerHCalArray) delete fItTowerHCalArray;
 
+  if(fTowerTrackArray) delete fTowerTrackArray;
+  if(fItTowerTrackArray) delete fItTowerTrackArray;
   if(fTowerECalTrackArray) delete fTowerECalTrackArray;
   if(fItTowerECalTrackArray) delete fItTowerECalTrackArray;
@@ -352 +357 @@
       fTowerHCalTrackHits = 0;
 
+      fTowerECalArray->Clear();
+      fTowerHCalArray->Clear();
+
+      fTowerTrackArray->Clear();
       fTowerECalTrackArray->Clear();
       fTowerHCalTrackArray->Clear();
-      fTowerECalArray->Clear();
-      fTowerHCalArray->Clear();
     }
 
@@ -365 +372 @@
       ++fTowerTrackAllHits;
       fTowerTrackArray->Add(track);
+
+      // check for track ECAL hits
       if(flags & 2)
       {
@@ -370 +379 @@
         fTowerECalTrackArray->Add(track);
       }
+
+      // check for track HCAL hits
       if(flags & 4)
       {
@@ -379 +390 @@
 
     ++fTowerAllHits;
-
-    // check for ECAL hits in current tower
+    fTower->AddCandidate(particle);
+
+    // check for ECAL hits
     if(flags & 2)
     {
@@ -387 +399 @@
     }
 
-    // check for HCAL hits in current tower
+    // check for HCAL hits
     if(flags & 4)
     {
@@ -406 +418 @@
     fTowerECalEnergy += ecalEnergy;
     fTowerHCalEnergy += hcalEnergy;
-
-    fTower->AddCandidate(particle);
   }
 

trunk/modules/Calorimeter.h

@@ -74 +74 @@
   TObjArray *fEFlowTowerOutputArray; //!
 
+  TObjArray *fTowerECalArray; //!
+  TIterator *fItTowerECalArray; //!
+
+  TObjArray *fTowerHCalArray; //!
+  TIterator *fItTowerHCalArray; //!
+
+  TObjArray *fTowerTrackArray; //!
+  TIterator *fItTowerTrackArray; //!
+
   TObjArray *fTowerECalTrackArray; //!
   TIterator *fItTowerECalTrackArray; //!
@@ -79 +88 @@
   TObjArray *fTowerHCalTrackArray; //!
   TIterator *fItTowerHCalTrackArray; //!
-
-  TObjArray *fTowerECalArray; //!
-  TIterator *fItTowerECalArray; //!
-
-  TObjArray *fTowerHCalArray; //!
-  TIterator *fItTowerHCalArray; //!
 
   void FinalizeTower();