Changeset 73 in svn for trunk/Delphes.cpp

Timestamp:

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

Author:

uid677

Message:

new PartUtil class

File:

• trunk/Delphes.cpp (modified) (6 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);
           }