Changeset 914fb04 in git

Timestamp:

Oct 1, 2015, 3:32:32 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c62695e

Parents:

122e1e5 (diff), fa7f333 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #16 from selvaggi/master

fixed eflow at high pt

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
 
@@ -287 +288 @@
 module SimpleCalorimeter HCal {
   set ParticleInputArray ParticlePropagator/stableParticles
-  set TrackInputArray ImpactParameterSmearing/tracks
+  set TrackInputArray ECal/eflowTracks
 
   set TowerOutputArray hcalTowers
+  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowNeutralHadrons
 
@@ -365 +367 @@
 module Merger EFlowMerger {
 # add InputArray InputArray
-  add InputArray ImpactParameterSmearing/tracks
+  add InputArray HCal/eflowTracks
   add InputArray ECal/eflowPhotons
   add InputArray HCal/eflowNeutralHadrons

cards/delphes_card_ILD.tcl

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

cards/delphes_card_LHCb.tcl

@@ -270 +270 @@
 
   set TowerOutputArray ecalTowers
+  set EFlowTrackOutputArray eflowTracks
   set EFlowTowerOutputArray eflowPhotons
 
@@ -349 +350 @@
 module SimpleCalorimeter HCal {
   set ParticleInputArray ParticlePropagator/stableParticles
-  set TrackInputArray IdentificationMap/tracks
+  set TrackInputArray ECal/eflowTracks
 
   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),
@@ -267 +268 @@
   object.Yd = Yd;
   object.Zd = Zd;
-
+  object.TrackResolution = TrackResolution;
   object.NCharged = NCharged;
   object.NNeutrals = NNeutrals;
@@ -368 +369 @@
   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
 
@@ -591 +595 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 3)
+  ClassDef(Candidate, 4)
 };
 

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);
@@ -501 +509 @@
   // fill energy flow candidates
 
-  // save all the tracks as energy flow tracks
-  fItTowerTrackArray->Reset();
-  while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
-  {
-    fEFlowTrackOutputArray->Add(track);
-  }
-
-  ecalEnergy -= fTrackECalEnergy;
-  hcalEnergy -= fTrackHCalEnergy;
+  // 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);        
+       }
+     }
+  }
 
   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"));
 }
@@ -395 +397 @@
 void SimpleCalorimeter::FinalizeTower()
 {
-  Candidate *tower;
+  Candidate *tower, *track;
   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;
 
@@ -439 +447 @@
   if(energy > 0.0) fTowerOutputArray->Add(fTower);
 
-  // fill energy flow candidates
-  energy -= fTrackEnergy;
+
+
+  // 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);
+     }
+
+  }
+
 
   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; //!