Changeset a221d1f in git for modules

Timestamp:

Dec 19, 2014, 2:52:00 AM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c04eb8a

Parents:

1c6dd69

Message:

add DitherTowerCenters parameter [close #363]

Location:

modules

Files:

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

modules/Calorimeter.cc

@@ -86 +86 @@
 {
   ExRootConfParam param, paramEtaBins, paramPhiBins, paramFractions;
-  Long_t i, j, k, size, sizeEtaBins, sizePhiBins, sizeFractions;
+  Long_t i, j, k, size, sizeEtaBins, sizePhiBins;
   Double_t ecalFraction, hcalFraction;
   TBinMap::iterator itEtaBin;
@@ -139 +139 @@
   {
     paramFractions = param[i*2 + 1];
-    sizeFractions = paramFractions.GetSize();
 
     ecalFraction = paramFractions[0].GetDouble();
@@ -155 +154 @@
 
   // read min E value for towers to be saved
-  fEcalEnergyMin = GetDouble("EcalTowerMinEnergy", 0.0); 
-  fHcalEnergyMin = GetDouble("HcalTowerMinEnergy", 0.0); 
-  
-  fEcalSigmaMin  = GetDouble("EcalTowerMinSignificance", 0.0); 
-  fHcalSigmaMin  = GetDouble("HcalTowerMinSignificance", 0.0); 
-
- 
+  fEcalEnergyMin = GetDouble("EcalTowerMinEnergy", 0.0);
+  fHcalEnergyMin = GetDouble("HcalTowerMinEnergy", 0.0);
+
+  fEcalSigmaMin  = GetDouble("EcalTowerMinSignificance", 0.0);
+  fHcalSigmaMin  = GetDouble("HcalTowerMinSignificance", 0.0);
+
+
   // read resolution formulas
   fECalResolutionFormula->Compile(GetString("ECalResolutionFormula", "0"));
@@ -176 +175 @@
   fTowerOutputArray = ExportArray(GetString("TowerOutputArray", "towers"));
   fPhotonOutputArray = ExportArray(GetString("PhotonOutputArray", "photons"));
-  
+
   fEFlowTrackOutputArray = ExportArray(GetString("EFlowTrackOutputArray", "eflowTracks"));
   fEFlowPhotonOutputArray = ExportArray(GetString("EFlowPhotonOutputArray", "eflowPhotons"));
   fEFlowNeutralHadronOutputArray = ExportArray(GetString("EFlowNeutralHadronOutputArray", "eflowNeutralHadrons"));
 
-
+  fDitherTowerCenter = GetBool("DitherTowerCenters", true);
 }
 
@@ -366 +365 @@
       fTrackHCalTime = 0.0;
 
-      fTowerECalWeightTime = 0.0; 
+      fTowerECalWeightTime = 0.0;
       fTowerHCalWeightTime = 0.0;
-     
+
       fTowerTrackHits = 0;
       fTowerPhotonHits = 0;
-      
+
       fTowerTrackArray->Clear();
     }
@@ -384 +383 @@
       position = track->Position;
 
-      
+
       ecalEnergy = momentum.E() * fTrackECalFractions[number];
       hcalEnergy = momentum.E() * fTrackHCalFractions[number];
@@ -390 +389 @@
       fTrackECalEnergy += ecalEnergy;
       fTrackHCalEnergy += hcalEnergy;
-      
+
       fTrackECalTime += TMath::Sqrt(ecalEnergy)*position.T();
       fTrackHCalTime += TMath::Sqrt(hcalEnergy)*position.T();
-       
+
       fTrackECalWeightTime += TMath::Sqrt(ecalEnergy);
       fTrackHCalWeightTime += TMath::Sqrt(hcalEnergy);
@@ -401 +400 @@
       continue;
     }
-   
+
     // check for photon and electron hits in current tower
     if(flags & 2) ++fTowerPhotonHits;
-    
+
     particle = static_cast<Candidate*>(fParticleInputArray->At(number));
     momentum = particle->Momentum;
@@ -421 +420 @@
     fTowerECalWeightTime += TMath::Sqrt(ecalEnergy);
     fTowerHCalWeightTime += TMath::Sqrt(hcalEnergy);
-    
+
 
     fTower->AddCandidate(particle);
@@ -462 +461 @@
   hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
 
-  
+
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
@@ -470 +469 @@
 
   energy = ecalEnergy + hcalEnergy;
-  time = (TMath::Sqrt(ecalEnergy)*ecalTime + TMath::Sqrt(hcalEnergy)*hcalTime)/(TMath::Sqrt(ecalEnergy) + TMath::Sqrt(hcalEnergy)); 
-
-//  eta = fTowerEta;
-//  phi = fTowerPhi;
-
-  eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
-  phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
+  time = (TMath::Sqrt(ecalEnergy)*ecalTime + TMath::Sqrt(hcalEnergy)*hcalTime)/(TMath::Sqrt(ecalEnergy) + TMath::Sqrt(hcalEnergy));
+
+  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);
@@ -497 +501 @@
       fPhotonOutputArray->Add(fTower);
     }
-   
+
     fTowerOutputArray->Add(fTower);
   }

modules/Calorimeter.h

@@ -63 +63 @@
   Double_t fTowerECalEnergy, fTowerHCalEnergy;
   Double_t fTrackECalEnergy, fTrackHCalEnergy;
-  
+
   Double_t fTowerECalTime, fTowerHCalTime;
   Double_t fTrackECalTime, fTrackHCalTime;
-   
+
   Double_t fTowerECalWeightTime, fTowerHCalWeightTime;
   Double_t fTrackECalWeightTime, fTrackHCalWeightTime;
-  
+
   Int_t fTowerTrackHits, fTowerPhotonHits;
+
+  Bool_t fDitherTowerCenter;
 
   Double_t fEcalEnergyMin;
   Double_t fHcalEnergyMin;
-  
+
   Double_t fEcalSigmaMin;
   Double_t fHcalSigmaMin;
@@ -103 +105 @@
   TObjArray *fTowerOutputArray; //!
   TObjArray *fPhotonOutputArray; //!
- 
+
   TObjArray *fEFlowTrackOutputArray; //!
   TObjArray *fEFlowPhotonOutputArray; //!