Changes in modules/OldCalorimeter.cc [341014c:b906e2b] in git

File:

• modules/OldCalorimeter.cc (modified) (22 diffs)

modules/OldCalorimeter.cc

@@ -19 +19 @@
 #include "classes/DelphesFormula.h"
 
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootResult.h"
-
+
+#include "TMath.h"
+#include "TString.h"
+#include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
 #include "TDatabasePDG.h"
-#include "TFormula.h"
 #include "TLorentzVector.h"
-#include "TMath.h"
-#include "TObjArray.h"
-#include "TRandom3.h"
-#include "TString.h"
 
 #include <algorithm>
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -82 +82 @@
   if(fItTowerECalTrackArray) delete fItTowerECalTrackArray;
   if(fTowerHCalTrackArray) delete fTowerHCalTrackArray;
-  if(fItTowerHCalTrackArray) delete fItTowerHCalTrackArray;
-}
+  if(fItTowerHCalTrackArray) delete fItTowerHCalTrackArray;}
 
 //------------------------------------------------------------------------------
@@ -93 +92 @@
   Double_t ecalFraction, hcalFraction;
   TBinMap::iterator itEtaBin;
-  set<Double_t>::iterator itPhiBin;
-  vector<Double_t> *phiBins;
+  set< Double_t >::iterator itPhiBin;
+  vector< Double_t > *phiBins;
 
   // read eta and phi bins
@@ -102 +101 @@
   fEtaBins.clear();
   fPhiBins.clear();
-  for(i = 0; i < size / 2; ++i)
-  {
-    paramEtaBins = param[i * 2];
+  for(i = 0; i < size/2; ++i)
+  {
+    paramEtaBins = param[i*2];
     sizeEtaBins = paramEtaBins.GetSize();
-    paramPhiBins = param[i * 2 + 1];
+    paramPhiBins = param[i*2 + 1];
     sizePhiBins = paramPhiBins.GetSize();
 
@@ -123 +122 @@
   {
     fEtaBins.push_back(itEtaBin->first);
-    phiBins = new vector<double>(itEtaBin->second.size());
+    phiBins = new vector< double >(itEtaBin->second.size());
     fPhiBins.push_back(phiBins);
     phiBins->clear();
@@ -140 +139 @@
   fFractionMap[0] = make_pair(0.0, 1.0);
 
-  for(i = 0; i < size / 2; ++i)
-  {
-    paramFractions = param[i * 2 + 1];
+  for(i = 0; i < size/2; ++i)
+  {
+    paramFractions = param[i*2 + 1];
     sizeFractions = paramFractions.GetSize();
 
@@ -148 +147 @@
     hcalFraction = paramFractions[1].GetDouble();
 
-    fFractionMap[param[i * 2].GetInt()] = make_pair(ecalFraction, hcalFraction);
-  }
-  /*
+    fFractionMap[param[i*2].GetInt()] = make_pair(ecalFraction, hcalFraction);
+  }
+/*
   TFractionMap::iterator itFractionMap;
   for(itFractionMap = fFractionMap.begin(); itFractionMap != fFractionMap.end(); ++itFractionMap)
@@ -180 +179 @@
 void OldCalorimeter::Finish()
 {
-  vector<vector<Double_t> *>::iterator itPhiBin;
+  vector< vector< Double_t>* >::iterator itPhiBin;
   if(fItParticleInputArray) delete fItParticleInputArray;
   if(fItTrackInputArray) delete fItTrackInputArray;
@@ -204 +203 @@
   TFractionMap::iterator itFractionMap;
 
-  vector<Double_t>::iterator itEtaBin;
-  vector<Double_t>::iterator itPhiBin;
-  vector<Double_t> *phiBins;
-
-  vector<Long64_t>::iterator itTowerHits;
+  vector< Double_t >::iterator itEtaBin;
+  vector< Double_t >::iterator itPhiBin;
+  vector< Double_t > *phiBins;
+
+  vector< Long64_t >::iterator itTowerHits;
 
   DelphesFactory *factory = GetFactory();
@@ -218 +217 @@
   fItParticleInputArray->Reset();
   number = -1;
-  while((particle = static_cast<Candidate *>(fItParticleInputArray->Next())))
+  while((particle = static_cast<Candidate*>(fItParticleInputArray->Next())))
   {
     const TLorentzVector &particlePosition = particle->Position;
@@ -266 +265 @@
   fItTrackInputArray->Reset();
   number = -1;
-  while((track = static_cast<Candidate *>(fItTrackInputArray->Next())))
+  while((track = static_cast<Candidate*>(fItTrackInputArray->Next())))
   {
     const TLorentzVector &trackPosition = track->Position;
@@ -316 +315 @@
     towerHit = (*itTowerHits);
     flags = (towerHit >> 24) & 0x00000000000000FFLL;
-    number = (towerHit)&0x0000000000FFFFFFLL;
+    number = (towerHit) & 0x0000000000FFFFFFLL;
     hitEtaPhi = towerHit >> 32;
 
@@ -337 +336 @@
 
       // calculate eta and phi of the tower's center
-      fTowerEta = 0.5 * (fEtaBins[etaBin - 1] + fEtaBins[etaBin]);
-      fTowerPhi = 0.5 * ((*phiBins)[phiBin - 1] + (*phiBins)[phiBin]);
+      fTowerEta = 0.5*(fEtaBins[etaBin - 1] + fEtaBins[etaBin]);
+      fTowerPhi = 0.5*((*phiBins)[phiBin - 1] + (*phiBins)[phiBin]);
 
       fTowerEdges[0] = fEtaBins[etaBin - 1];
@@ -369 +368 @@
     if(flags & 1)
     {
-      track = static_cast<Candidate *>(fTrackInputArray->At(number));
+      track = static_cast<Candidate*>(fTrackInputArray->At(number));
 
       ++fTowerTrackAllHits;
@@ -409 +408 @@
     if(flags & 8) ++fTowerPhotonHits;
 
-    particle = static_cast<Candidate *>(fParticleInputArray->At(number));
+    particle = static_cast<Candidate*>(fParticleInputArray->At(number));
     momentum = particle->Momentum;
 
@@ -437 +436 @@
   if(!fTower) return;
 
-  //  ecalEnergy = gRandom->Gaus(fTowerECalEnergy, fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy));
-  //  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
+//  ecalEnergy = gRandom->Gaus(fTowerECalEnergy, fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy));
+//  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
 
   ecalEnergy = LogNormal(fTowerECalEnergy, fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy));
 
-  //  hcalEnergy = gRandom->Gaus(fTowerHCalEnergy, fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy));
-  //  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
+//  hcalEnergy = gRandom->Gaus(fTowerHCalEnergy, fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy));
+//  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
 
   hcalEnergy = LogNormal(fTowerHCalEnergy, fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy));
@@ -449 +448 @@
   energy = ecalEnergy + hcalEnergy;
 
-  //  eta = fTowerEta;
-  //  phi = fTowerPhi;
+//  eta = fTowerEta;
+//  phi = fTowerPhi;
 
   eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
@@ -482 +481 @@
   {
     fItTowerTrackArray->Reset();
-    while((track = static_cast<Candidate *>(fItTowerTrackArray->Next())))
+    while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
     {
       fEFlowTrackOutputArray->Add(track);
     }
   }
-  else if(fTowerTrackAllHits > 0 && fTowerECalHits + fTowerHCalHits == fTowerAllHits)
-  {
-    if(fTowerECalHits == fTowerECalTrackHits && fTowerHCalHits == fTowerHCalTrackHits)
+  else if(fTowerTrackAllHits > 0 &&
+          fTowerECalHits + fTowerHCalHits == fTowerAllHits)
+  {
+    if(fTowerECalHits == fTowerECalTrackHits &&
+       fTowerHCalHits == fTowerHCalTrackHits)
     {
       itTowerTrackArray = fItTowerTrackArray;
@@ -505 +506 @@
 
         fItTowerHCalArray->Reset();
-        while((particle = static_cast<Candidate *>(fItTowerHCalArray->Next())))
+        while((particle = static_cast<Candidate*>(fItTowerHCalArray->Next())))
         {
           tower->AddCandidate(particle);
@@ -537 +538 @@
 
         fItTowerECalArray->Reset();
-        while((particle = static_cast<Candidate *>(fItTowerECalArray->Next())))
+        while((particle = static_cast<Candidate*>(fItTowerECalArray->Next())))
         {
           tower->AddCandidate(particle);
@@ -566 +567 @@
     {
       itTowerTrackArray->Reset();
-      while((track = static_cast<Candidate *>(itTowerTrackArray->Next())))
+      while((track = static_cast<Candidate*>(itTowerTrackArray->Next())))
       {
         fEFlowTrackOutputArray->Add(track);
@@ -586 +587 @@
   if(mean > 0.0)
   {
-    b = TMath::Sqrt(TMath::Log((1.0 + (sigma * sigma) / (mean * mean))));
-    a = TMath::Log(mean) - 0.5 * b * b;
-
-    return TMath::Exp(a + b * gRandom->Gaus(0, 1));
+    b = TMath::Sqrt(TMath::Log((1.0 + (sigma*sigma)/(mean*mean))));
+    a = TMath::Log(mean) - 0.5*b*b;
+
+    return TMath::Exp(a + b*gRandom->Gaus(0, 1));
   }
   else