Changeset 350 in svn for trunk/src

Timestamp:

May 6, 2009, 8:57:21 PM (16 years ago)

Author:

severine ovyn

Message:

first test HepMC

Location:

trunk/src

Files:

• HEPEVTConverter.cc (modified) (3 diffs)
• HEPMCConverter.cc (modified) (1 diff)
• HepMCConverter.cc (added)
• JetsUtil.cc (modified) (1 diff)
• STDHEPConverter.cc (modified) (3 diffs)
• SmearUtil.cc (modified) (2 diffs)

trunk/src/HEPEVTConverter.cc

@@ -176 +176 @@
 
   ExRootTreeWriter *treeWriter = new ExRootTreeWriter(outputFileName, "GEN");
-  ExRootTreeBranch *branchGen = treeWriter->NewBranch("Particle", GenParticle::Class());
+  ExRootTreeBranch *branchGen = treeWriter->NewBranch("Particle", TRootC::GenParticle::Class());
   
   ifstream infile(inputFileList.c_str());
@@ -211 +211 @@
       Float_t signEta;
       
-      GenParticle *element;
+      TRootC::GenParticle *element;
       
       // Loop over all events
@@ -222 +222 @@
           for(particle = 0; particle < event.Nhep; ++particle)
             {
-              element = (GenParticle*) branchGen->NewEntry();
+              element = (TRootC::GenParticle*) branchGen->NewEntry();
               
               element->PID = event.Idhep[particle];     

trunk/src/HEPMCConverter.cc

@@ -55 +55 @@
   ExRootTreeWriter *treeWriter = new ExRootTreeWriter(outputFileName, "GEN");
   ExRootTreeBranch *branchGenEvent = treeWriter->NewBranch("Event", TRootGenEvent::Class());
-  ExRootTreeBranch *branchGenParticle = treeWriter->NewBranch("Particle", GenParticle::Class());
+  ExRootTreeBranch *branchGenParticle = treeWriter->NewBranch("Particle", TRootC::GenParticle::Class());
   
   // Open the datafile list

trunk/src/JetsUtil.cc

@@ -190 +190 @@
 
 
-void JetsUtil::RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<GenParticle>& NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM)
+void JetsUtil::RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle>& NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM)
 {
   TRootJet *elementJet;

trunk/src/STDHEPConverter.cc

@@ -62 +62 @@
   else Nmax = myhepevt.nhep;
 
-  GenParticle *element;
+  TRootC::GenParticle *element;
 
   Double_t signPz;
@@ -70 +70 @@
   for(number = 0; number < Nmax; ++number)
   {
-    element = static_cast<GenParticle*>(branch->NewEntry());
+    element = static_cast<TRootC::GenParticle*>(branch->NewEntry());
 
     element->PID = myhepevt.idhep[number];
@@ -119 +119 @@
   ExRootTreeBranch *branchGenEvent = treeWriter->NewBranch("Event", TRootGenEvent::Class());
   // generated particles from HEPEVT
-  ExRootTreeBranch *branchGenParticle = treeWriter->NewBranch("Particle", GenParticle::Class());
+  ExRootTreeBranch *branchGenParticle = treeWriter->NewBranch("Particle", TRootC::GenParticle::Class());
   
   // Open a stream connected to an event file:

trunk/src/SmearUtil.cc

@@ -1064 +1064 @@
 //used by Btaggedjet
 ///// Attention : bug removed => CONERADIUS/2 -> CONERADIUS !!
-int RESOLution::Bjets(const TSimpleArray<GenParticle> &subarray, const float& eta, const float& phi) {
+int RESOLution::Bjets(const TSimpleArray<TRootC::GenParticle> &subarray, const float& eta, const float& phi) {
   float emax=0;
   int Ppid=0;
@@ -1081 +1081 @@
 
 //******************** Simulates the b-tagging efficiency for real bjet, or the misendentification for other jets****************
-bool RESOLution::Btaggedjet(const TLorentzVector &JET, const TSimpleArray<GenParticle> &subarray) {
+bool RESOLution::Btaggedjet(const TLorentzVector &JET, const TSimpleArray<TRootC::GenParticle> &subarray) {
   if(      rand()%100 < (BTAG_b+1)    && Bjets(subarray,JET.Eta(),JET.Phi())==pB ) return true; // b-tag of b-jets is 40%
   else if( rand()%100 < (BTAG_mistag_c+1) && Bjets(subarray,JET.Eta(),JET.Phi())==pC ) return true; // b-tag of c-jets is 10%