Changeset 306 in svn for trunk/Delphes.cpp

Timestamp:

Mar 9, 2009, 12:38:39 PM (16 years ago)

Author:

severine ovyn

Message:

OK flags very forward

File:

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

trunk/Delphes.cpp

@@ -296 +296 @@
   ExRootTreeBranch *branchMuon = treeWriter->NewBranch("Muon", TRootMuon::Class());
   ExRootTreeBranch *branchPhoton = treeWriter->NewBranch("Photon", TRootPhoton::Class());
-  //ExRootTreeBranch *branchTracks = treeWriter->NewBranch("Tracks", TRootTracks::Class());
   ExRootTreeBranch *branchTrack = treeWriter->NewBranch("Tracks", TRootTracks::Class());
   ExRootTreeBranch *branchETmis = treeWriter->NewBranch("ETmis", TRootETmis::Class());
@@ -318 +317 @@
   vector<fastjet::PseudoJet> input_particles;//for FastJet algorithm
   vector<fastjet::PseudoJet> sorted_jets;
-  //vector<TLorentzVector> TrackCentral;  
   vector<TRootTracks> TrackCentral;  
   vector<PhysicsTower> towers;
-  //vector<ParticleUtil> electron;
   vector<D_Particle> electron;
-  //vector<ParticleUtil> muon;
   vector<D_Particle> muon;
-  //vector<ParticleUtil> gamma;
   vector<D_Particle> gamma;
 
@@ -509 +504 @@
             }
             // 2.1a.2.5 : very forward detectors
-            else if (DET->FLAG_vfd==1) {
-                // for the moment, only protons are transported
-                // BUT !!! could be a beam of other particles! (heavy ions?)
-                // BUT ALSO !!! if very forward muons, or others!
-              VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
-              VFD->ZDC(treeWriter,branchZDC,particle);
-            }
-            // 2.1a.2.6: Zero degree calorimeter
-            //else if(DET->FLAG_zdc==1) {
-              //VFD->ZDC(treeWriter,branchZDC,particle);
-            //}
+            else
+              {
+                if (DET->FLAG_RP==1) {
+                   // for the moment, only protons are transported
+                   // BUT !!! could be a beam of other particles! (heavy ions?)
+                   // BUT ALSO !!! if very forward muons, or others!
+                   VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle);
+                }
+                // 2.1a.2.6: Zero degree calorimeter
+                if(DET->FLAG_vfd==1) {
+                   VFD->ZDC(treeWriter,branchZDC,particle);
+                }
+              }
 
           } // 2.1a.2 : if visible particle
@@ -579 +576 @@
         elementElec->PhiCalo = electron[i].PhiCalo();
         elementElec->Charge = sign(electron[i].PID());
-        //elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,2.0,0.5);//isolation based on tracks
         elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone);//isolation based on tracks
       }                                                                                 /////////////// HARDCODING
@@ -589 +585 @@
         elementMu->EtaCalo = muon[i].EtaCalo(); 
         elementMu->PhiCalo = muon[i].PhiCalo();
-        //elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,2.0,0.5); /////////////// HARDCODING
         elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone); /////////////// HARDCODING
       }