Changeset 380 in svn for trunk/Delphes.cpp

Timestamp:

May 12, 2009, 9:47:12 AM (15 years ago)

Author:

Xavier Rouby

Message:

new PDG table

File:

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

trunk/Delphes.cpp

@@ -213 +213 @@
   //Smearing information
   RESOLution *DET = new RESOLution();
+
   cout <<"**                                                                 **"<< endl;
   cout <<"**        ####### Start reading DETECTOR parameters #######        **"<< endl;
@@ -224 +225 @@
        << right << setw(2) <<"**"<<""<<endl;
   cout <<"**                                                                 **"<< endl;
+  DET->ReadParticleDataGroupTable();
+  //DET->PDGtable.print();
   
   //Trigger information
@@ -260 +263 @@
       cout <<"**                 StdHEP file format detected                     **"<<endl;
       cout <<"**                This can take several minutes                    **"<< endl;
-      STDHEPConverter converter(inputFileList,outputfilename);//case ntpl file in input list
+      STDHEPConverter converter(inputFileList,outputfilename,DET->PDGtable);//case ntpl file in input list
     }
   else if(line.length() == 1+line.find_last_of(".lhe"))
@@ -266 +269 @@
       cout <<"**                   LHEF file format detected                     **"<<endl;
       cout <<"**                 This can take several minutes                   **"<< endl;
-      LHEFConverter converter(inputFileList,outputfilename);//case ntpl file in input list
+      LHEFConverter converter(inputFileList,outputfilename,DET->PDGtable);//case ntpl file in input list
     }
   else if(line.length() == 1+line.find_last_of(".root"))
@@ -272 +275 @@
       cout <<"**                   h2root file format detected                   **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
-      HEPEVTConverter converter(inputFileList,outputfilename);//case ntpl file in input list
+      HEPEVTConverter converter(inputFileList,outputfilename,DET->PDGtable);//case ntpl file in input list
     }
   else if(line.length() == 1+line.find_last_of(".hepmc"))
@@ -278 +281 @@
       cout <<"**                HepMC ASCII file format detected                 **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
-      HepMCConverter converter(inputFileList,outputfilename);
+      HepMCConverter converter(inputFileList,outputfilename,DET->PDGtable);
     }
   else {
@@ -309 +312 @@
   ExRootTreeBranch *branchZDC = treeWriter->NewBranch("ZDChits", TRootZdcHits::Class());
   ExRootTreeBranch *branchRP220 = treeWriter->NewBranch("RP220hits", TRootRomanPotHits::Class());
-  ExRootTreeBranch *branchFP420 = treeWriter->NewBranch("FP420hits", TRootForwardTaggerHits::Class());
+  //ExRootTreeBranch *branchFP420 = treeWriter->NewBranch("FP420hits", TRootForwardTaggerHits::Class());
+  ExRootTreeBranch *branchFP420 = treeWriter->NewBranch("FP420hits", TRootRomanPotHits::Class());
   
   TRootETmis *elementEtmis;
@@ -397 +401 @@
         {
           TRootGenParticle *particle = new TRootGenParticle(particleG);
+          PdgParticle pdg_part = DET->PDGtable[particle->PID];
+          particle->Charge  = pdg_part.charge();
+          particle->M  = pdg_part.mass();
+          //particle->Charge=ChargeVal(particle->PID);
+          particle->setFractions(); // init
           int pid = abs(particle->PID);
-          particle->Charge=ChargeVal(particle->PID);
-          particle->setFractions(); // init