Changeset ca29ad7 in git

Timestamp:

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

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a190d94

Parents:

8624f58

Message:

replace WeightTime with TimeWeight

Location:

modules

Files:

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

modules/Calorimeter.cc

@@ -367 +367 @@
       fTrackHCalTime = 0.0;
 
-      fTowerECalWeightTime = 0.0;
-      fTowerHCalWeightTime = 0.0;
+      fTowerECalTimeWeight = 0.0;
+      fTowerHCalTimeWeight = 0.0;
 
       fTowerTrackHits = 0;
@@ -395 +395 @@
       fTrackHCalTime += TMath::Sqrt(hcalEnergy)*position.T();
 
-      fTrackECalWeightTime += TMath::Sqrt(ecalEnergy);
-      fTrackHCalWeightTime += TMath::Sqrt(hcalEnergy);
+      fTrackECalTimeWeight += TMath::Sqrt(ecalEnergy);
+      fTrackHCalTimeWeight += TMath::Sqrt(hcalEnergy);
 
       fTowerTrackArray->Add(track);
@@ -420 +420 @@
     fTowerHCalTime += TMath::Sqrt(hcalEnergy)*position.T();
 
-    fTowerECalWeightTime += TMath::Sqrt(ecalEnergy);
-    fTowerHCalWeightTime += TMath::Sqrt(hcalEnergy);
+    fTowerECalTimeWeight += TMath::Sqrt(ecalEnergy);
+    fTowerHCalTimeWeight += TMath::Sqrt(hcalEnergy);
 
 
@@ -446 +446 @@
 
   ecalEnergy = LogNormal(fTowerECalEnergy, ecalSigma);
-  ecalTime = (fTowerECalWeightTime < 1.0E-09 ) ? 0 : fTowerECalTime/fTowerECalWeightTime;
+  ecalTime = (fTowerECalTimeWeight < 1.0E-09 ) ? 0 : fTowerECalTime/fTowerECalTimeWeight;
 
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
 
   hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
-  hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
+  hcalTime = (fTowerHCalTimeWeight < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalTimeWeight;
 
 

modules/Calorimeter.h

@@ -67 +67 @@
   Double_t fTrackECalTime, fTrackHCalTime;
 
-  Double_t fTowerECalWeightTime, fTowerHCalWeightTime;
-  Double_t fTrackECalWeightTime, fTrackHCalWeightTime;
+  Double_t fTowerECalTimeWeight, fTowerHCalTimeWeight;
+  Double_t fTrackECalTimeWeight, fTrackHCalTimeWeight;
 
   Int_t fTowerTrackHits, fTowerPhotonHits;