Changes in modules/TreeWriter.cc [cc8716b:b750b0a] in git

File:

• modules/TreeWriter.cc (modified) (10 diffs)

modules/TreeWriter.cc

@@ -45 +45 @@
 #include "TString.h"
 
-#include <set>
 #include <algorithm>
 #include <iostream>
@@ -77 +76 @@
   fClassMap[Electron::Class()] = &TreeWriter::ProcessElectrons;
   fClassMap[Muon::Class()] = &TreeWriter::ProcessMuons;
-  fClassMap[CscCluster::Class()] = &TreeWriter::ProcessCscCluster;
   fClassMap[Jet::Class()] = &TreeWriter::ProcessJets;
   fClassMap[MissingET::Class()] = &TreeWriter::ProcessMissingET;
@@ -151 +149 @@
 {
   TIter it1(candidate->GetCandidates());
-  set<Candidate *> s;
-  set<Candidate *>::iterator it3;
   it1.Reset();
-  s.clear();
   array->Clear();
 
@@ -164 +159 @@
     if(candidate->GetCandidates()->GetEntriesFast() == 0)
     {
-      s.insert(candidate);
+      array->Add(candidate);
       continue;
     }
@@ -172 +167 @@
     if(candidate->GetCandidates()->GetEntriesFast() == 0)
     {
-      s.insert(candidate);
+      array->Add(candidate);
       continue;
     }
@@ -180 +175 @@
     while((candidate = static_cast<Candidate *>(it2.Next())))
     {
-      candidate = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
-      if(candidate->GetCandidates()->GetEntriesFast() == 0)
-      {
-        s.insert(candidate);
-      }
+      array->Add(candidate->GetCandidates()->At(0));
     }
-  }
-
-  for(it3 = s.begin(); it3 != s.end(); ++it3)
-  {
-    array->Add(*it3);
   }
 }
@@ -252 +238 @@
     entry->Z = position.Z();
     entry->T = position.T() * 1.0E-3 / c_light;
-
   }
 }
@@ -399 +384 @@
     entry->Zd = candidate->Zd;
 
-    entry->XFirstHit = candidate->XFirstHit;
-    entry->YFirstHit = candidate->YFirstHit;
-    entry->ZFirstHit = candidate->ZFirstHit;
-
     const TLorentzVector &momentum = candidate->Momentum;
 
@@ -563 +544 @@
     entry->Zd = candidate->Zd;
 
-    entry->XFirstHit = candidate->XFirstHit;
-    entry->YFirstHit = candidate->YFirstHit;
-    entry->ZFirstHit = candidate->ZFirstHit;
-
     const TLorentzVector &momentum = candidate->Momentum;
 
@@ -909 +886 @@
   }
 }
-//------------------------------------------------------------------------------
-
-void TreeWriter::ProcessCscCluster(ExRootTreeBranch *branch, TObjArray *array)
-{
-  TIter iterator(array);
-  Candidate *candidate = 0;
-  CscCluster *entry = 0;
-  Double_t pt, signPz, cosTheta, eta, rapidity;
-
-  const Double_t c_light = 2.99792458E8; // in unit of m/s
-
-  array->Sort();
-
-
-  // loop over all clusters
-  iterator.Reset();
-  while((candidate = static_cast<Candidate *>(iterator.Next())))
-  {
-    const TLorentzVector &momentum = candidate->Momentum;
-    const TLorentzVector &position = candidate->DecayPosition;
-
-    pt = momentum.Pt();
-    cosTheta = TMath::Abs(momentum.CosTheta());
-    signPz = (momentum.Pz() >= 0.0) ? 1.0 : -1.0;
-    eta = (cosTheta == 1.0 ? signPz * 999.9 : momentum.Eta());
-
-    entry = static_cast<CscCluster *>(branch->NewEntry());
-
-    entry->SetBit(kIsReferenced);
-    entry->SetUniqueID(candidate->GetUniqueID());
-
-    entry->Eta = eta;
-    entry->Phi = momentum.Phi();
-
-    entry->PT = momentum.Pt(); // pt of LLP
-    entry->Px = momentum.Px();// px of LLP
-    entry->Py = momentum.Py();// py of LLP
-    entry->Pz = momentum.Pz();// pz of LLP
-    entry->E = momentum.E(); // E of LLP
-    entry->pid = candidate->PID; // LLP pid
-    entry->Eem = candidate->Eem; // LLP Eem
-    entry->Ehad = candidate->Ehad; // LLP Ehad
-    Double_t beta = momentum.P()/momentum.E();
-    Double_t gamma = 1.0/sqrt(1-beta*beta);
-    Double_t decayDistance = sqrt(pow(position.X(),2)+pow(position.Y(),2)+pow(position.Z(),2)); // mm
-    entry->beta = beta; // LLP pid
-    entry->ctau = decayDistance/(beta * gamma); // LLP travel time in its rest frame
-    entry->T = decayDistance*(1./beta-1)* 1.0E-3/c_light*1e9; // ns
-    entry->X = position.X(); // LLP decay x
-    entry->Y = position.Y(); //  LLP decay y
-    entry->Z = position.Z(); //  LLP decay z
-  }
-}
 
 //------------------------------------------------------------------------------