Changeset 73 in svn for trunk

Timestamp:

Dec 3, 2008, 5:22:43 PM (16 years ago)

Author:

uid677

Message:

new PartUtil class

Location:

trunk

Files:

• Delphes.cpp (modified) (6 diffs)
• Utilities/ExRootAnalysis/interface/BlockClasses.h (modified) (2 diffs)
• Utilities/ExRootAnalysis/src/BlockClasses.cc (modified) (3 diffs)
• interface/SmearUtil.h (modified) (1 diff)
• src/SmearUtil.cc (modified) (2 diffs)

trunk/Delphes.cpp

@@ -177 +177 @@
   vector<PhysicsTower> towers;
   
-  vector<TLorentzVector> electron;
-  vector<int> elecPID;
-  vector<TLorentzVector> muon;
-  vector<int> muonPID;
+  vector<ParticleUtil> electron;
+  vector<ParticleUtil> muon;
   TSimpleArray<TRootGenParticle> NFCentralQ;
   
@@ -197 +195 @@
       electron.clear();
       muon.clear();
-      elecPID.clear();
-      muonPID.clear();
       NFCentralQ.Clear();
       
@@ -231 +227 @@
             TRACP->Propagation(particle,genMomentum);
             float eta=fabs(genMomentum.Eta());
+
             switch(pid) {
               
             case pE: // all electrons with eta < DET->MAX_CALO_FWD
               DET->SmearElectron(genMomentum);
-              electron.push_back(genMomentum);
-              elecPID.push_back(particle->PID);
+              electron.push_back(ParticleUtil(genMomentum,particle->PID));
               break; // case pE
             case pGAMMA: // all photons with eta < DET->MAX_CALO_FWD
@@ -247 +243 @@
             case pMU: // all muons with eta < DET->MAX_MU
               DET->SmearMu(genMomentum);
-              muonPID.push_back(particle->PID);
-              muon.push_back(genMomentum);
+              muon.push_back(ParticleUtil(genMomentum,particle->PID));
               break; // case pMU
             case pLAMBDA: // all lambdas with eta < DET->MAX_CALO_FWD
@@ -304 +299 @@
         } // while
       
-      for(unsigned int i=0; i < electron.size(); i++) {
+        for(unsigned int i=0; i < electron.size(); i++) {
         if(electron[i].E()!=0 && fabs(electron[i].Eta()) < DET->MAX_TRACKER && electron[i].Pt() > DET->ELEC_pt)
           {
             elementElec = (TRootElectron*) branchElectron->NewEntry();
-            elementElec->Set(electron[i]);
-            elementElec->Charge = sign(elecPID[i]);
+            elementElec->Set(electron[i].Px(),electron[i].Py(),electron[i].Pz(),electron[i].E());
+            elementElec->Charge = sign(electron[i].PID());
             elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,2.0);
           }
@@ -317 +312 @@
           {
             elementMu = (TRootMuon*) branchMuon->NewEntry();
-            elementMu->Charge = sign(muonPID[i]);
-            elementMu->Set(muon[i]);
+            elementMu->Charge = sign(muon[i].PID());
+            elementMu->Set(muon[i].Px(),muon[i].Py(),muon[i].Pz(),muon[i].E());
             elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,2.0);
           }

trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

@@ -13 +13 @@
  *  present in the data members of the Block TRoot class.
  *
- *  $Date: 2008-12-03 11:01:04 $
- *  $Revision: 1.6 $
+ *  $Date: 2008-12-03 16:22:42 $
+ *  $Revision: 1.7 $
  *
  *  
@@ -159 +159 @@
 
   void Set(const TLorentzVector& momentum);
+  void Set(float px,float py,float pz, float e);
   static TCompare *fgCompare; //!
   const TCompare *GetCompare() const { return fgCompare; }

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -11 +11 @@
  *  to preserve mother-dautherlinks between particles.
  *
- *  $Date: 2008-12-02 19:50:30 $
- *  $Revision: 1.3 $
+ *  $Date: 2008-12-03 16:22:43 $
+ *  $Revision: 1.4 $
  *
  *  
@@ -21 +21 @@
 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h"
 #include "Utilities/ExRootAnalysis/interface/BlockCompare.h"
+
+#include "TLorentzVector.h"
 
 TCompare *TRootGenParticle::fgCompare = 0;
@@ -47 +49 @@
         Phi = momentum.Phi();
 }
+void TRootParticle::Set(float px,float py,float pz, float e) {
+        TLorentzVector toFill;
+        toFill.SetPxPyPzE(px,py,pz,e);
+        E   = e;
+        Px  = px;
+        Py  = py;
+        Pz  = pz;
+        PT  = toFill.Pt();
+        Eta = toFill.Eta();
+        Phi = toFill.Phi();
+}
 
+

trunk/interface/SmearUtil.h

@@ -23 +23 @@
 
 #include "Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh"
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <iomanip>
+
 using namespace std;
+
+class ParticleUtil {
+
+ public:
+
+  TLorentzVector TLVector;
+  int Pid;
+
+  ParticleUtil(const TLorentzVector &genMomentum,const int &pid) : TLVector(genMomentum) , Pid(pid) {}
+
+  float E() {return TLVector.E();}  // particle energy in GeV
+  float Px() {return TLVector.Px();}  // particle energy in GeV
+  float Py() {return TLVector.Py();}  // particle energy in GeV
+  float Pz() {return TLVector.Pz();}  // particle energy in GeV
+  float Pt() {return TLVector.Pt();}  // particle energy in GeV
+  float Eta() {return TLVector.Eta();}  // particle energy in GeV
+  float Phi() {return TLVector.Phi();}  // particle energy in GeV
+  float PID() {return Pid;}  // particle energy in GeV
+
+ private:
+
+};
+
 
 class RESOLution

trunk/src/SmearUtil.cc

@@ -573 +573 @@
   if(hadron.E() < 0)hadron.SetPxPyPzE(0,0,0,0);
 }
+/*
+void RESOLution::SortedVector()
+{
+  int i,j = 0;
+  TLorentzVector tmp;
+  bool en_desordre = true;
+  for(i = 0 ; (i < numjetT) && en_desordre; i++)
+    {
+      en_desordre = false;
+      for(j = 1 ; j < numjetT - i ; j++)
+        {
+          if ( Wjets[j].Eta() > Wjets[j-1].Eta() )
+             {
+               TLorentzVector tmp = Wjets[j-1];
+               Wjets[j-1] = Wjets[j];
+               Wjets[j] = tmp;
+               en_desordre = true;
+              }
+        }
+    }
+    
+}*/
 
 // **********Provides the energy in the cone of radius TAU_CONE_ENERGY for the tau identification********
@@ -684 +706 @@
    if (phi > PI-dphi) iPhi = PI-dphi;
 }
-
+/*
+ParticleUtil::ParticleUtil(const TLorentzVector genMomentum,int pid){
+  E=genMomentum.E();
+  Px=genMomentum.Px();
+  Py=genMomentum.Py();
+  Pz=genMomentum.Pz();
+  PT=genMomentum.Pt();
+  Phi=genMomentum.Phi();
+  Eta=genMomentum.Eta();
+  PID=pid;
+
+}
+*/
+/*
+void ParticleUtil::GetInfo()
+{
+
+}
+*/
 
 //**************************** Returns the delta Phi ****************************