Changeset 8624f58 in git for modules

Timestamp:

Dec 19, 2014, 2:11:47 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ca29ad7

Parents:

c04eb8a

Message:

replace Ecal with ECal and Hcal with HCal

Location:

modules

Files:

• Calorimeter.cc (modified) (9 diffs)
• Calorimeter.h (modified) (1 diff)

modules/Calorimeter.cc

@@ -145 +145 @@
     fFractionMap[param[i*2].GetInt()] = make_pair(ecalFraction, hcalFraction);
   }
+
 /*
   TFractionMap::iterator itFractionMap;
@@ -154 +155 @@
 
   // 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("ECalMinEnergy", 0.0);
+  fHCalEnergyMin = GetDouble("HCalMinEnergy", 0.0);
+
+  fECalSigmaMin  = GetDouble("ECalMinSignificance", 0.0);
+  fHCalSigmaMin  = GetDouble("HCalMinSignificance", 0.0);
+
+  // switch on or off the dithering of the center of calorimeter towers
+  fDitherTowerCenter = GetBool("DitherTowerCenter", true);
 
   // read resolution formulas
@@ -180 +183 @@
   fEFlowNeutralHadronOutputArray = ExportArray(GetString("EFlowNeutralHadronOutputArray", "eflowNeutralHadrons"));
 
-  fDitherTowerCenter = GetBool("DitherTowerCenter", true);
 }
 
@@ -440 +442 @@
 
   if(!fTower) return;
-//  cout<<"----------------------"<<endl;
-//  cout<<"Finalize Tower"<<endl;
-//  cout<<""<<endl;
-
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
-
-//  ecalEnergy = gRandom->Gaus(fTowerECalEnergy, ecalSigma);
-//  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
 
   ecalEnergy = LogNormal(fTowerECalEnergy, ecalSigma);
@@ -455 +450 @@
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
 
-//  hcalEnergy = gRandom->Gaus(fTowerHCalEnergy, hcalSigma);
-//  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
-
   hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
   hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
@@ -465 +457 @@
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
 
-  ecalEnergy = (ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
-  hcalEnergy = (hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
+  ecalEnergy = (ecalEnergy < fECalEnergyMin || ecalEnergy < fECalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
+  hcalEnergy = (hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
 
   energy = ecalEnergy + hcalEnergy;
@@ -484 +476 @@
   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);
@@ -515 +506 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
+  if(ecalEnergy < fECalEnergyMin || ecalEnergy < fECalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
 
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
+  if(hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
@@ -548 +539 @@
     fEFlowNeutralHadronOutputArray->Add(tower);
   }
-
-
-
-
 }
 

modules/Calorimeter.h

@@ -72 +72 @@
   Int_t fTowerTrackHits, fTowerPhotonHits;
 
+  Double_t fECalEnergyMin;
+  Double_t fHCalEnergyMin;
+
+  Double_t fECalSigmaMin;
+  Double_t fHCalSigmaMin;
+
   Bool_t fDitherTowerCenter;
-
-  Double_t fEcalEnergyMin;
-  Double_t fHcalEnergyMin;
-
-  Double_t fEcalSigmaMin;
-  Double_t fHcalSigmaMin;
 
   TFractionMap fFractionMap; //!