Changeset 270 in svn for trunk/Delphes.cpp

Timestamp:

Feb 14, 2009, 2:06:20 AM (16 years ago)

Author:

severine ovyn

Message:

remove double GEN pfff

File:

• trunk/Delphes.cpp (modified) (6 diffs)

trunk/Delphes.cpp

@@ -385 +385 @@
       // 2.1a Loop over all particles in event, to fill the towers
       itGen.Reset();
-      TRootGenParticle *particle; 
-      while( (particle = (TRootGenParticle*) itGen.Next()) ) {
-          int pid = abs(particle->PID);
-          particle->Charge=Charge(pid);
-          particle->setFractions(); // init
+      GenParticle *particleG; 
+      while( (particleG = (GenParticle*) itGen.Next()) ) {
+
+      TRootGenParticle *particle = new TRootGenParticle(particleG);
+      int pid = abs(particle->PID);
+      particle->Charge=ChargeVal(particle->PID);
+      particle->setFractions(); // init
 
 
@@ -407 +409 @@
             // 2.1a.2.1 Central solenoidal magnetic field 
             TRACP->bfield(particle); // fills in particle->EtaCalo et particle->PhiCalo
-
             // 2.1a.2.2 Filling the calorimetric towers -- includes also forward detectors ?
             // first checks if the charged particles reach the calo!
             if( DET->FLAG_bfield || 
-                particle->getCharge()==0 ||
-                (!DET->FLAG_bfield && particle->getCharge()!=0 && particle->PT > DET->TRACK_ptmin)) 
+                particle->Charge==0 ||
+                (!DET->FLAG_bfield && particle->Charge!=0 && particle->PT > DET->TRACK_ptmin)) 
             if(
                 (particle->EtaCalo > list_of_calorimeters.getEtamin() ) &&
@@ -434 +435 @@
             // if bfield not simulated, pt should be high enough to be taken into account
             // it is supposed here that DET->MAX_calo > DET->CEN_max_tracker > DET->CEN_max_mu > 0
-            if( particle->getCharge() !=0 &&
+            if( particle->Charge !=0 &&
                 fabs(particle->EtaCalo)< DET->CEN_max_tracker && // stays in the tracker -> track available
                ( DET->FLAG_bfield || 
@@ -447 +448 @@
 
                    // 2.1a.2.3.2 Muons
-                   if (pid == pMU && fabs(particle->EtaCalo)< DET->CEN_max_mu && particle->PT > DET->PTCUT_muon ) {
+                   if (pid == pMU && fabs(particle->EtaCalo)< DET->CEN_max_mu) {
                         TLorentzVector p;
                         float sPT = gRandom->Gaus(particle->PT, DET->MU_SmearPt*particle->PT );
@@ -518 +519 @@
 
           } // 2.1a.2 : if visible particle
+        delete particle;
       } // loop on all particles 2.1a
         
@@ -589 +591 @@
         elementPhoton = (TRootPhoton*) branchPhoton->NewEntry();
         elementPhoton->Set(gamma[i].Px(),gamma[i].Py(),gamma[i].Pz(),gamma[i].E());
-        elementPhoton->EtaCalo = gamma[i].EtaCalo();
-        elementPhoton->PhiCalo = gamma[i].PhiCalo();
       }