Changeset 1356 in svn for trunk

Timestamp:

Mar 9, 2014, 12:09:46 PM (11 years ago)

Author:

Michele Selvaggi

Message:

separated Photon and Neutral Hadron components in particle algorithm

Location:

trunk/modules

Files:

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

trunk/modules/Calorimeter.cc

@@ -3 +3 @@
  *
  *  Fills calorimeter towers, performs calorimeter resolution smearing,
- *  preselects towers hit by photons and creates energy flow objects.
+ *  and creates energy flow objects (tracks, photons, and neutral hadrons).
  *
  *  $Date$
@@ -149 +149 @@
   fTowerOutputArray = ExportArray(GetString("TowerOutputArray", "towers"));
   fPhotonOutputArray = ExportArray(GetString("PhotonOutputArray", "photons"));
-
+  
   fEFlowTrackOutputArray = ExportArray(GetString("EFlowTrackOutputArray", "eflowTracks"));
-  fEFlowTowerOutputArray = ExportArray(GetString("EFlowTowerOutputArray", "eflowTowers"));
+  fEFlowPhotonOutputArray = ExportArray(GetString("EFlowPhotonOutputArray", "eflowPhotons"));
+  fEFlowNeutralHadronOutputArray = ExportArray(GetString("EFlowNeutralHadronOutputArray", "eflowNeutralHadrons"));
+
+
 }
 
@@ -341 +344 @@
       fTowerTrackHits = 0;
       fTowerPhotonHits = 0;
-
+      
       fTowerTrackArray->Clear();
     }
@@ -371 +374 @@
       continue;
     }
-
+   
     // check for photon and electron hits in current tower
     if(flags & 2) ++fTowerPhotonHits;
-
+    
     particle = static_cast<Candidate*>(fParticleInputArray->At(number));
     momentum = particle->Momentum;
@@ -451 +454 @@
 
 
-  // fill calorimeter towers and photon candidates
+  // fill calorimeter towers
   if(energy > 0.0)
   {
@@ -458 +461 @@
       fPhotonOutputArray->Add(fTower);
     }
-
+   
     fTowerOutputArray->Add(fTower);
   }
@@ -479 +482 @@
   energy = ecalEnergy + hcalEnergy;
 
+  
   // save ECAL and/or HCAL energy excess as an energy flow tower
-  if(energy > 0.0)
-  {
-    // create new tower
+  if(ecalEnergy > 0.0)
+  {
+    // create new photon tower
     tower = static_cast<Candidate*>(fTower->Clone());
 
-    pt = energy / TMath::CosH(eta);
-
-    tower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
+    pt = ecalEnergy / TMath::CosH(eta);
+
+    tower->Momentum.SetPtEtaPhiE(pt, eta, phi, ecalEnergy);
     tower->Eem = ecalEnergy;
+    tower->Ehad = 0;
+
+    fEFlowPhotonOutputArray->Add(tower);
+  }
+
+  if(hcalEnergy > 0.0)
+  {
+    // create new neutral hadron tower
+    tower = static_cast<Candidate*>(fTower->Clone());
+
+    pt = hcalEnergy / TMath::CosH(eta);
+
+    tower->Momentum.SetPtEtaPhiE(pt, eta, phi, hcalEnergy);
+    tower->Eem = 0;
     tower->Ehad = hcalEnergy;
 
-    fEFlowTowerOutputArray->Add(tower);
-  }
+    fEFlowNeutralHadronOutputArray->Add(tower);
+  }
+
+
+
+
 }
 

trunk/modules/Calorimeter.h

@@ -5 +5 @@
  *
  *  Fills calorimeter towers, performs calorimeter resolution smearing,
- *  preselects towers hit by photons and creates energy flow objects.
+ *  and creates energy flow objects (tracks, photons, and neutral hadrons).
  *
  *  $Date$
@@ -79 +79 @@
   TObjArray *fTowerOutputArray; //!
   TObjArray *fPhotonOutputArray; //!
-
+ 
   TObjArray *fEFlowTrackOutputArray; //!
-  TObjArray *fEFlowTowerOutputArray; //!
+  TObjArray *fEFlowPhotonOutputArray; //!
+  TObjArray *fEFlowNeutralHadronOutputArray; //!
 
   TObjArray *fTowerTrackArray; //!