Changeset 1240 in svn for trunk/modules

Timestamp:

Jul 23, 2013, 1:14:48 AM (11 years ago)

Author:

Pavel Demin

Message:

reorganize new energy flow cases

File:

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

trunk/modules/Calorimeter.cc

@@ -431 +431 @@
   Double_t energy, pt, eta, phi;
   Double_t ecalEnergy, hcalEnergy;
-  TIterator *iterator;
+  TIterator *itTowerTrackArray, *itTowerArray;
 
   if(!fTower) return;
@@ -486 +486 @@
   }
   else if(fTowerTrackAllHits > 0 &&
-          fTowerECalHits + fTowerHCalHits == fTowerAllHits &&
-          (fTowerECalHits == fTowerECalTrackHits || fTowerHCalHits == fTowerHCalTrackHits))
-  {
-    if(fTowerECalHits == fTowerECalTrackHits)
-    {
-      fItTowerECalTrackArray->Reset();
-      while((track = static_cast<Candidate*>(fItTowerECalTrackArray->Next())))
+          fTowerECalHits + fTowerHCalHits == fTowerAllHits)
+  {
+    if(fTowerECalHits == fTowerECalTrackHits &&
+       fTowerHCalHits == fTowerHCalTrackHits)
+    {
+      itTowerTrackArray = fItTowerTrackArray;
+      itTowerArray = 0;
+      energy = 0.0;
+    }
+    else if(fTowerECalHits == fTowerECalTrackHits)
+    {
+      itTowerTrackArray = fItTowerECalTrackArray;
+      itTowerArray = fItTowerHCalArray;
+      energy = hcalEnergy;
+    }
+    else if(fTowerHCalHits == fTowerHCalTrackHits)
+    {
+      itTowerTrackArray = fItTowerHCalTrackArray;
+      itTowerArray = fItTowerECalArray;
+      energy = ecalEnergy;
+    }
+    else
+    {
+      itTowerTrackArray = 0;
+      itTowerArray = 0;
+      energy = 0.0;
+      fEFlowTowerOutputArray->Add(fTower);
+    }
+
+    if(itTowerTrackArray)
+    {
+      itTowerTrackArray->Reset();
+      while((track = static_cast<Candidate*>(itTowerTrackArray->Next())))
       {
         fEFlowTrackOutputArray->Add(track);
       }
-      energy = hcalEnergy;
-      iterator = fItTowerHCalArray;
-    }
-
-    if(fTowerHCalHits == fTowerHCalTrackHits)
-    {
-      fItTowerHCalTrackArray->Reset();
-      while((track = static_cast<Candidate*>(fItTowerHCalTrackArray->Next())))
-      {
-        fEFlowTrackOutputArray->Add(track);
-      }
-      energy = ecalEnergy;
-      iterator = fItTowerECalArray;
-    }
-
-    if(fTowerECalHits == fTowerECalTrackHits &&
-       fTowerHCalHits == fTowerHCalTrackHits)
-    {
-      energy = 0.0;
-      iterator = 0;
-    }
-
-    if(energy > 0.0 && iterator)
+    }
+
+    if(itTowerArray && energy > 0.0)
     {
       DelphesFactory *factory = GetFactory();
@@ -525 +531 @@
       tower = factory->NewCandidate();
 
-      iterator->Reset();
-      while((particle = static_cast<Candidate*>(iterator->Next())))
+      itTowerArray->Reset();
+      while((particle = static_cast<Candidate*>(itTowerArray->Next())))
       {
         tower->AddCandidate(particle);