Changeset 839deb7 in git for modules

Timestamp:

Jun 29, 2015, 10:27:47 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c1ce3fe

Parents:

5d2481f

Message:

fix variable names and formatting

Location:

modules

Files:

• Calorimeter.cc (modified) (8 diffs)
• Calorimeter.h (modified) (1 diff)
• PileUpJetID.cc (modified) (3 diffs)
• TreeWriter.cc (modified) (1 diff)

modules/Calorimeter.cc

@@ -142 +142 @@
   }
 
-/*
-  TFractionMap::iterator itFractionMap;
-  for(itFractionMap = fFractionMap.begin(); itFractionMap != fFractionMap.end(); ++itFractionMap)
-  {
-    cout << itFractionMap->first << "   " << itFractionMap->second.first  << "   " << itFractionMap->second.second << endl;
-  }
-*/
-
   // read min E value for timing measurement in ECAL
-  fTimingEMin = GetDouble("TimingEMin",4.);
+  fTimingEnergyMin = GetDouble("TimingEnergyMin",4.);
   // For timing
   // So far this flag needs to be false
@@ -157 +149 @@
   fElectronsFromTrack = false;
 
-  
   // read min E value for towers to be saved
   fECalEnergyMin = GetDouble("ECalEnergyMin", 0.0);
@@ -385 +376 @@
       fTrackHCalEnergy += hcalEnergy;
 
-      bool dbg_scz = false;
-      if (dbg_scz) {
-        cout << "   Calorimeter input track has x y z t " << track->Position.X() << " " << track->Position.Y() << " " << track->Position.Z() << " " << track->Position.T() 
-             << endl;
-        Candidate *prt = static_cast<Candidate*>(track->GetCandidates()->Last());
-        const TLorentzVector &ini = prt->Position;
-
-        cout << "                and parent has x y z t " << ini.X() << " " << ini.Y() << " " << ini.Z() << " " << ini.T();
-
+      if(ecalEnergy > fTimingEnergyMin && fTower)
+      {
+        if(fElectronsFromTrack)
+        {
+          fTower->ECalEnergyTimePairs.push_back(make_pair<Float_t, Float_t>(ecalEnergy, track->Position.T()));
+        }
       }
-      
-      if (ecalEnergy > fTimingEMin && fTower) {
-        if (fElectronsFromTrack) {
-          //      cout << " SCZ Debug pushing back track hit E=" << ecalEnergy << " T=" << track->Position.T() << " isPU=" << track->IsPU << " isRecoPU=" << track->IsRecoPU 
-          //           << " PID=" << track->PID << endl;
-          fTower->Ecal_E_t.push_back(std::make_pair<float,float>(ecalEnergy,track->Position.T()));
-        } else {
-          //      cout << " Skipping track hit E=" << ecalEnergy << " T=" << track->Position.T() << " isPU=" << track->IsPU << " isRecoPU=" << track->IsRecoPU 
-          //           << " PID=" << track->PID << endl;
-        }
-      }
-
 
       fTowerTrackArray->Add(track);
@@ -412 +388 @@
       continue;
     }
-  
+
     // check for photon and electron hits in current tower
     if(flags & 2) ++fTowerPhotonHits;
@@ -427 +403 @@
     fTowerHCalEnergy += hcalEnergy;
 
-    if (ecalEnergy > fTimingEMin && fTower) {
-      if (abs(particle->PID) != 11 || !fElectronsFromTrack) {
-        //      cout << " SCZ Debug About to push back particle hit E=" << ecalEnergy << " T=" << particle->Position.T() << " isPU=" << particle->IsPU 
-        //   << " PID=" << particle->PID << endl;
-        fTower->Ecal_E_t.push_back(std::make_pair<Float_t,Float_t>(ecalEnergy,particle->Position.T()));
-      } else {
-        
-        // N.B. Only charged particle set to leave ecal energy is the electrons
-        //      cout << " SCZ Debug To avoid double-counting, skipping particle hit E=" << ecalEnergy << " T=" << particle->Position.T() << " isPU=" << particle->IsPU 
-        //           << " PID=" << particle->PID << endl;
-        
+    if(ecalEnergy > fTimingEnergyMin && fTower)
+    {
+      if (abs(particle->PID) != 11 || !fElectronsFromTrack)
+      {
+        fTower->ECalEnergyTimePairs.push_back(make_pair<Float_t, Float_t>(ecalEnergy, particle->Position.T()));
       }
     }
@@ -456 +426 @@
   Double_t ecalEnergy, hcalEnergy;
   Double_t ecalSigma, hcalSigma;
- 
+  Float_t weight, sumWeightedTime, sumWeight;
+
   if(!fTower) return;
 
@@ -472 +443 @@
 
   energy = ecalEnergy + hcalEnergy;
-    
+
   if(fSmearTowerCenter)
   {
@@ -487 +458 @@
 
   // Time calculation for tower
-  fTower->Ntimes = 0;
-  Float_t tow_sumT = 0;
-  Float_t tow_sumW = 0;
-  
-  for (Int_t i = 0 ; i < fTower->Ecal_E_t.size() ; i++) 
-  {
-    Float_t w = TMath::Sqrt(fTower->Ecal_E_t[i].first);
-    tow_sumT += w*fTower->Ecal_E_t[i].second;
-    tow_sumW += w;
-    fTower->Ntimes++;
-  }
-  
-  if (tow_sumW > 0.) {
-    fTower->Position.SetPtEtaPhiE(1.0, eta, phi,tow_sumT/tow_sumW);
-  } else {
-    fTower->Position.SetPtEtaPhiE(1.0,eta,phi,999999.);
+  fTower->NTimeHits = 0;
+  sumWeightedTime = 0.0;
+  sumWeight = 0.0;
+
+  for(size_t i = 0; i < fTower->ECalEnergyTimePairs.size(); ++i)
+  {
+    weight = TMath::Sqrt(fTower->ECalEnergyTimePairs[i].first);
+    sumWeightedTime += weight * fTower->ECalEnergyTimePairs[i].second;
+    sumWeight += weight;
+    fTower->NTimeHits++;
+  }
+
+  if(sumWeight > 0.0)
+  {
+    fTower->Position.SetPtEtaPhiE(1.0, eta, phi, sumWeightedTime/sumWeight);
+  }
+  else
+  {
+    fTower->Position.SetPtEtaPhiE(1.0, eta, phi, 999999.9);
   }
 

modules/Calorimeter.h

@@ -60 +60 @@
   Double_t fTrackECalEnergy, fTrackHCalEnergy;
 
-  Double_t fTimingEMin;
-  Bool_t fElectronsFromTrack; // for timing
-  
+  Double_t fTimingEnergyMin;
+  Bool_t fElectronsFromTrack;
+
   Int_t fTowerTrackHits, fTowerPhotonHits;
 

modules/PileUpJetID.cc

@@ -154 +154 @@
     float sumT40 = 0.;
     float sumWeightsForT = 0.;
-    candidate->Ntimes = 0;
+    candidate->NTimeHits = 0;
 
     float sumpt = 0.;
@@ -197 +197 @@
         float tow_sumT = 0;
         float tow_sumW = 0;
-        for (int i = 0 ; i < constituent->Ecal_E_t.size() ; i++) {
-          float w = TMath::Sqrt(constituent->Ecal_E_t[i].first);
+        for (int i = 0 ; i < constituent->ECalEnergyTimePairs.size() ; i++) {
+          float w = TMath::Sqrt(constituent->ECalEnergyTimePairs[i].first);
           if (fAverageEachTower) {
-            tow_sumT += w*constituent->Ecal_E_t[i].second;
+            tow_sumT += w*constituent->ECalEnergyTimePairs[i].second;
             tow_sumW += w;
           } else {
-            sumT0 += w*constituent->Ecal_E_t[i].second;
-            sumT1 += w*gRandom->Gaus(constituent->Ecal_E_t[i].second,0.001);
-            sumT10 += w*gRandom->Gaus(constituent->Ecal_E_t[i].second,0.010);
-            sumT20 += w*gRandom->Gaus(constituent->Ecal_E_t[i].second,0.020);
-            sumT30 += w*gRandom->Gaus(constituent->Ecal_E_t[i].second,0.030);
-            sumT40 += w*gRandom->Gaus(constituent->Ecal_E_t[i].second,0.040);
+            sumT0 += w*constituent->ECalEnergyTimePairs[i].second;
+            sumT1 += w*gRandom->Gaus(constituent->ECalEnergyTimePairs[i].second,0.001);
+            sumT10 += w*gRandom->Gaus(constituent->ECalEnergyTimePairs[i].second,0.010);
+            sumT20 += w*gRandom->Gaus(constituent->ECalEnergyTimePairs[i].second,0.020);
+            sumT30 += w*gRandom->Gaus(constituent->ECalEnergyTimePairs[i].second,0.030);
+            sumT40 += w*gRandom->Gaus(constituent->ECalEnergyTimePairs[i].second,0.040);
             sumWeightsForT += w;
-            candidate->Ntimes++;
+            candidate->NTimeHits++;
           }
         }
@@ -221 +221 @@
           sumT40 += tow_sumW*gRandom->Gaus(tow_sumT/tow_sumW,0.0040);
           sumWeightsForT += tow_sumW;
-          candidate->Ntimes++;
+          candidate->NTimeHits++;
         }
       }

modules/TreeWriter.cc

@@ -362 +362 @@
 
     entry->T = position.T()*1.0E-3/c_light;
-    entry->Ntimes = candidate->Ntimes;
+    entry->NTimeHits = candidate->NTimeHits;
 
     FillParticles(candidate, &entry->Particles);