Changes in / [914fb04:122e1e5] in git

Files:

• cards/delphes_card_FCC_basic.tcl (modified) (3 diffs)
• cards/delphes_card_ILD.tcl (modified) (3 diffs)
• cards/delphes_card_LHCb.tcl (modified) (2 diffs)
• classes/DelphesClasses.cc (modified) (3 diffs)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/Calorimeter.cc (modified) (2 diffs)
• modules/EnergySmearing.cc (modified) (1 diff)
• modules/MomentumSmearing.cc (modified) (1 diff)
• modules/SimpleCalorimeter.cc (modified) (3 diffs)
• modules/SimpleCalorimeter.h (modified) (1 diff)

cards/delphes_card_FCC_basic.tcl

@@ -224 +224 @@
 
   set TowerOutputArray ecalTowers
-  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowPhotons
 
@@ -288 +287 @@
 module SimpleCalorimeter HCal {
   set ParticleInputArray ParticlePropagator/stableParticles
-  set TrackInputArray ECal/eflowTracks
+  set TrackInputArray ImpactParameterSmearing/tracks
 
   set TowerOutputArray hcalTowers
-  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowNeutralHadrons
 
@@ -367 +365 @@
 module Merger EFlowMerger {
 # add InputArray InputArray
-  add InputArray HCal/eflowTracks
+  add InputArray ImpactParameterSmearing/tracks
   add InputArray ECal/eflowPhotons
   add InputArray HCal/eflowNeutralHadrons

cards/delphes_card_ILD.tcl

@@ -214 +214 @@
 
   set TowerOutputArray ecalTowers
-  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowPhotons
 
@@ -275 +274 @@
 module SimpleCalorimeter HCal {
   set ParticleInputArray ParticlePropagator/stableParticles
-  set TrackInputArray ECal/eflowTracks
+  set TrackInputArray ImpactParameterSmearing/tracks
 
   set TowerOutputArray hcalTowers
-  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowNeutralHadrons
 
@@ -351 +349 @@
 module Merger EFlowMerger {
 # add InputArray InputArray
-  add InputArray HCal/eflowTracks
+  add InputArray ImpactParameterSmearing/tracks
   add InputArray ECal/eflowPhotons
   add InputArray HCal/eflowNeutralHadrons

cards/delphes_card_LHCb.tcl

@@ -270 +270 @@
 
   set TowerOutputArray ecalTowers
-  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowPhotons
 
@@ -350 +349 @@
 module SimpleCalorimeter HCal {
   set ParticleInputArray ParticlePropagator/stableParticles
-  set TrackInputArray ECal/eflowTracks
+  set TrackInputArray IdentificationMap/tracks
 
   set TowerOutputArray hcalTowers
-  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowNeutralHadrons
 

classes/DelphesClasses.cc

@@ -129 +129 @@
   Area(0.0, 0.0, 0.0, 0.0),
   Dxy(0), SDxy(0), Xd(0), Yd(0), Zd(0),
-  TrackResolution(0),
   NCharged(0),
   NNeutrals(0),
@@ -268 +267 @@
   object.Yd = Yd;
   object.Zd = Zd;
-  object.TrackResolution = TrackResolution;
+
   object.NCharged = NCharged;
   object.NNeutrals = NNeutrals;
@@ -369 +368 @@
   Yd = 0.0;
   Zd = 0.0;
-  TrackResolution = 0.0;
   NCharged = 0;
   NNeutrals = 0;

classes/DelphesClasses.h

@@ -534 +534 @@
   Float_t Zd;
 
-  // tracking resolution
-  
-  Float_t TrackResolution;
-
   // PileUpJetID variables
 
@@ -595 +591 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 4)
+  ClassDef(Candidate, 3)
 };
 

modules/Calorimeter.cc

@@ -426 +426 @@
   Double_t ecalEnergy, hcalEnergy;
   Double_t ecalSigma, hcalSigma;
-  Double_t ecalTrkSigma, hcalTrkSigma;
-  Double_t ecalFraction, hcalFraction;
-  
-  Int_t pdgCode;
-  TLorentzVector momentum;
-  TFractionMap::iterator itFractionMap;
-  
   Float_t weight, sumWeightedTime, sumWeight;
 
   if(!fTower) return;
 
-  
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
@@ -509 +501 @@
   // fill energy flow candidates
 
-  // save as eflowtracks only tracks that have better resolution than calo 
- 
-   fItTowerTrackArray->Reset();
-   while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
-   {
-     momentum = track->Momentum;
-   
-     pdgCode = TMath::Abs(track->PID);
-
-     itFractionMap = fFractionMap.find(pdgCode);
-     if(itFractionMap == fFractionMap.end())
-     {
-       itFractionMap = fFractionMap.find(0);
-     }
-
-     ecalFraction = itFractionMap->second.first;
-     hcalFraction = itFractionMap->second.second;
-
-     // charged particle has to deposit either in ECAL or HCAL
- 
-     if(ecalFraction < 1.0E-9 && hcalFraction < 1.0E-9) continue;  
-     if(ecalFraction > 1.0E-9 && hcalFraction > 1.0E-9) continue;  
- 
-     if(ecalFraction > 1.0E-9)
-     {
-       if(track->TrackResolution < ecalTrkSigma/momentum.E()) 
-       {
-         ecalTrkSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());  
-         ecalEnergy -= momentum.E();
-         fEFlowTrackOutputArray->Add(track);        
-       }
-    
-     }
-    
-     if(hcalFraction > 1.0E-9)
-     {
-       if(track->TrackResolution < hcalTrkSigma/momentum.E())
-       {
-         hcalTrkSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());  
-         hcalEnergy -= momentum.E();
-         fEFlowTrackOutputArray->Add(track);        
-       }
-     }
-  }
+  // save all the tracks as energy flow tracks
+  fItTowerTrackArray->Reset();
+  while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
+  {
+    fEFlowTrackOutputArray->Add(track);
+  }
+
+  ecalEnergy -= fTrackECalEnergy;
+  hcalEnergy -= fTrackHCalEnergy;
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);

modules/EnergySmearing.cc

@@ -119 +119 @@
     phi = candidateMomentum.Phi();
     candidate->Momentum.SetPtEtaPhiE(energy/TMath::CosH(eta), eta, phi, energy);
-    candidate->TrackResolution = fFormula->Eval(pt, eta, phi, energy)/energy;
     candidate->AddCandidate(mother);
  

modules/MomentumSmearing.cc

@@ -118 +118 @@
     phi = candidateMomentum.Phi();
     candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt*TMath::CosH(eta));
-    candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
     candidate->AddCandidate(mother);
         

modules/SimpleCalorimeter.cc

@@ -168 +168 @@
   // create output arrays
   fTowerOutputArray = ExportArray(GetString("TowerOutputArray", "towers"));
- 
-  fEFlowTrackOutputArray = ExportArray(GetString("EFlowTrackOutputArray", "eflowTracks"));
   fEFlowTowerOutputArray = ExportArray(GetString("EFlowTowerOutputArray", "eflowTowers"));
 }
@@ -397 +395 @@
 void SimpleCalorimeter::FinalizeTower()
 {
-  Candidate *tower, *track;
+  Candidate *tower;
   Double_t energy, pt, eta, phi;
   Double_t sigma;
   Double_t time;
 
-  Double_t trkSigma, fraction;
-  
-  Int_t pdgCode;
-  TLorentzVector momentum;
-  TFractionMap::iterator itFractionMap;
- 
   if(!fTower) return;
 
@@ -447 +439 @@
   if(energy > 0.0) fTowerOutputArray->Add(fTower);
 
-
-
-  // fill e-flow candidates 
-  fItTowerTrackArray->Reset();
-  while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
-  {
-     momentum = track->Momentum;
-   
-     pdgCode = TMath::Abs(track->PID);
-
-     itFractionMap = fFractionMap.find(pdgCode);
-     if(itFractionMap == fFractionMap.end())
-     {
-       itFractionMap = fFractionMap.find(0);
-     }
-
-     fraction = itFractionMap->second;
-   
-     // charged particle has to deposit either in ECAL or HCAL
-     if(fraction < 1.0E-9) continue;  
-    
-     trkSigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());       
-  
-     if(track->TrackResolution < trkSigma/momentum.E()) 
-     {
-        energy -= momentum.E();
-        fEFlowTrackOutputArray->Add(track);
-     }
-
-  }
-
+  // fill energy flow candidates
+  energy -= fTrackEnergy;
 
   sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
+
   if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;
 

modules/SimpleCalorimeter.h

@@ -99 +99 @@
   TObjArray *fTowerOutputArray; //!
 
-  TObjArray *fEFlowTrackOutputArray; //!
   TObjArray *fEFlowTowerOutputArray; //!
-  
+
   TObjArray *fTowerTrackArray; //!
   TIterator *fItTowerTrackArray; //!