Changeset 567 in svn for trunk/src/JetsUtil.cc

Timestamp:

Jun 16, 2010, 11:05:05 AM (14 years ago)

Author:

Xavier Rouby

Message:

version 1.9

File:

• trunk/src/JetsUtil.cc (modified) (7 diffs)

trunk/src/JetsUtil.cc

@@ -122 +122 @@
 }
 
-vector<fastjet::PseudoJet> JetsUtil::RunJets(const vector<fastjet::PseudoJet>&  input_particles,  const vector<TRootTracks> & TrackCentral,  vector<int> &NTrackJet, vector<float> &EHADEEM,D_CaloTowerList list_of_active_towers)
+vector<fastjet::PseudoJet> JetsUtil::RunJets(const vector<fastjet::PseudoJet>&  input_particles,  const vector<TRootTracks> & TrackCentral,  vector<int> &NTrackJet, vector<float> &EHADEEM,D_CaloTowerList list_of_active_towers, vector<int> &NCALO)
 {
   inclusive_jets.clear();
@@ -144 +144 @@
             DET->BinEtaPhi(TrackCentral[t].PhiOuter,TrackCentral[t].EtaOuter,iPhiTrack[t],iEtaTrack[t]); 
           else {
-            iPhiTrack[t] = TrackCentral[t].PhiOuter;    iEtaTrack[t] = TrackCentral[t].EtaOuter; 
+            iPhiTrack[t] = TrackCentral[t].Phi;    iEtaTrack[t] = TrackCentral[t].Eta;  // should NOT be PhiOuter and EtaOuter
           }
         }
@@ -163 +163 @@
             //now, get EHad over EEm
             float EmVal=0,HadVal=0;
+            NCALO.push_back(constituents.size());
             for (unsigned int j = 0; j < constituents.size(); j++)
                 {
@@ -197 +198 @@
 
 
-void JetsUtil::RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle>& NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM)
+void JetsUtil::RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle>& NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM,  const vector<int> &NCALO)
 {
   TRootJet *elementJet;
@@ -209 +210 @@
         elementJet->NTracks = NTrackJet[i];
         elementJet->EHoverEE = EHADEEM[i];
+        elementJet->NCalo = NCALO[i];
 
         // b-jets
@@ -218 +220 @@
 }
 
-void JetsUtil::RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TRootTracks> & TrackCentral, const vector<int> &NTrackJet, const vector<float> &EHADEEM)
+void JetsUtil::RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TRootTracks> & TrackCentral, const vector<int> &NTrackJet, const vector<float> &EHADEEM,const vector<int> &NCALO)
 {
   TRootTauJet *elementTauJet;
@@ -240 +242 @@
         elementTauJet->Charge = charge;
         elementTauJet->EHoverEE = EHADEEM[i];
+        elementTauJet->NCalo = NCALO[i];
       } // if tau jet
     } // if JET.eta < tracker - tau_cone : Tau jet identification