Changeset d870fc5 in git for modules/SimpleCalorimeter.cc

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:

• modules/SimpleCalorimeter.cc (modified) (17 diffs)

modules/SimpleCalorimeter.cc

@@ -2 +2 @@
  *  Delphes: a framework for fast simulation of a generic collider experiment
  *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -22 +22 @@
  *  Fills SimpleCalorimeter towers, performs SimpleCalorimeter resolution smearing,
  *  and creates energy flow objects (tracks, photons, and neutral hadrons).
- *
- *  $Date: 2014-04-16 15:29:31 +0200 (Wed, 16 Apr 2014) $
- *  $Revision: 1364 $
- *
  *
  *  \author P. Demin - UCL, Louvain-la-Neuve
@@ -64 +60 @@
 {
   fResolutionFormula = new DelphesFormula;
- 
+
   fTowerTrackArray = new TObjArray;
   fItTowerTrackArray = fTowerTrackArray->MakeIterator();
@@ -74 +70 @@
 {
   if(fResolutionFormula) delete fResolutionFormula;
- 
+
   if(fTowerTrackArray) delete fTowerTrackArray;
   if(fItTowerTrackArray) delete fItTowerTrackArray;
@@ -140 +136 @@
     fFractionMap[param[i*2].GetInt()] = fraction;
   }
+
 /*
   TFractionMap::iterator itFractionMap;
@@ -149 +146 @@
 
   // read min E value for towers to be saved
-  fEnergyMin = GetDouble("TowerMinEnergy", 0.0); 
-  fSigmaMin  = GetDouble("TowerMinSignificance", 0.0); 
- 
+  fEnergyMin = GetDouble("EnergyMin", 0.0);
+
+  fEnergySignificanceMin = GetDouble("EnergySignificanceMin", 0.0);
+
+  // switch on or off the dithering of the center of calorimeter towers
+  fDitherTowerCenter = GetBool("DitherTowerCenter", true);
+
   // read resolution formulas
   fResolutionFormula->Compile(GetString("ResolutionFormula", "0"));
- 
+
   // import array with output from other modules
   fParticleInputArray = ImportArray(GetString("ParticleInputArray", "ParticlePropagator/particles"));
@@ -165 +166 @@
   fTowerOutputArray = ExportArray(GetString("TowerOutputArray", "towers"));
   fEFlowTowerOutputArray = ExportArray(GetString("EFlowTowerOutputArray", "eflowTowers"));
- 
 }
 
@@ -206 +206 @@
   fTowerFractions.clear();
   fTrackFractions.clear();
- 
+
   // loop over all particles
   fItParticleInputArray->Reset();
@@ -225 +225 @@
     fraction = itFractionMap->second;
     fTowerFractions.push_back(fraction);
-   
+
     if(fraction < 1.0E-9) continue;
 
@@ -267 +267 @@
 
     fraction = itFractionMap->second;
-  
+
     fTrackFractions.push_back(fraction);
-  
+
     // find eta bin [1, fEtaBins.size - 1]
     itEtaBin = lower_bound(fEtaBins.begin(), fEtaBins.end(), trackPosition.Eta());
@@ -333 +333 @@
       fTowerEnergy = 0.0;
       fTrackEnergy = 0.0;
-      
+
       fTowerTime = 0.0;
       fTrackTime = 0.0;
-     
-      fTowerWeightTime = 0.0; 
-      
+
+      fTowerTimeWeight = 0.0;
+
       fTowerTrackHits = 0;
       fTowerPhotonHits = 0;
-      
+
       fTowerTrackArray->Clear();
     }
@@ -353 +353 @@
       momentum = track->Momentum;
       position = track->Position;
- 
+
       energy = momentum.E() * fTrackFractions[number];
-      
+
       fTrackEnergy += energy;
-      
+
       fTrackTime += TMath::Sqrt(energy)*position.T();
-      fTrackWeightTime += TMath::Sqrt(energy);
-    
+      fTrackTimeWeight += TMath::Sqrt(energy);
+
       fTowerTrackArray->Add(track);
 
       continue;
     }
-   
+
     // check for photon and electron hits in current tower
     if(flags & 2) ++fTowerPhotonHits;
-    
+
     particle = static_cast<Candidate*>(fParticleInputArray->At(number));
     momentum = particle->Momentum;
@@ -375 +375 @@
     // fill current tower
     energy = momentum.E() * fTowerFractions[number];
-   
+
     fTowerEnergy += energy;
-    
+
     fTowerTime += TMath::Sqrt(energy)*position.T();
-    fTowerWeightTime += TMath::Sqrt(energy);
-    
+    fTowerTimeWeight += TMath::Sqrt(energy);
+
     fTower->AddCandidate(particle);
   }
@@ -401 +401 @@
   sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerEnergy);
 
-//  energy = gRandom->Gaus(fTowerEnergy, sigma);
-//  if(energy < 0.0) energy = 0.0;
-
   energy = LogNormal(fTowerEnergy, sigma);
-  time = (fTowerWeightTime < 1.0E-09 ) ? 0 : fTowerTime/fTowerWeightTime;
+
+  time = (fTowerTimeWeight < 1.0E-09 ) ? 0.0 : fTowerTime/fTowerTimeWeight;
 
   sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
-  
-  energy = (energy < fEnergyMin || energy < fSigmaMin*sigma) ? 0 : energy;
-  
-  eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
-  phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
+
+  if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;
+
+  if(fDitherTowerCenter)
+  {
+    eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
+    phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
+  }
+  else
+  {
+    eta = fTowerEta;
+    phi = fTowerPhi;
+  }
 
   pt = energy / TMath::CosH(eta);
 
- // fTower->Position.SetXYZT(-time, 0.0, 0.0, time);
   fTower->Position.SetPtEtaPhiE(1.0, eta, phi, time);
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
- 
+
   fTower->Edges[0] = fTowerEdges[0];
   fTower->Edges[1] = fTowerEdges[1];
@@ -425 +430 @@
   fTower->Edges[3] = fTowerEdges[3];
 
-
   // fill SimpleCalorimeter towers
   if(energy > 0.0) fTowerOutputArray->Add(fTower);
 
-  
   // fill energy flow candidates
   energy -= fTrackEnergy;
-  if(energy < fEnergyMin || energy < fSigmaMin*fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy)) energy = 0.0;
-   
+
+  sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
+
+  if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;
+
   // save energy excess as an energy flow tower
   if(energy > 0.0)
@@ -444 +450 @@
     fEFlowTowerOutputArray->Add(tower);
   }
-
 }
 
@@ -458 +463 @@
     a = TMath::Log(mean) - 0.5*b*b;
 
-    return TMath::Exp(a + b*gRandom->Gaus(0, 1));
+    return TMath::Exp(a + b*gRandom->Gaus(0.0, 1.0));
   }
   else