Changeset 270 in svn for trunk/src

Timestamp:

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

Author:

severine ovyn

Message:

remove double GEN pfff

Location:

trunk/src

Files:

• BFieldProp.cc (modified) (2 diffs)
• HEPEVTConverter.cc (modified) (3 diffs)
• STDHEPConverter.cc (modified) (3 diffs)
• SmearUtil.cc (modified) (1 diff)

trunk/src/BFieldProp.cc

@@ -118 +118 @@
 void TrackPropagation::Propagation(const TRootGenParticle *Part,TLorentzVector &momentum) {
 
-  q  = Charge(Part->PID);
+  q  = ChargeVal(Part->PID);
   if(q==0) return;
 
@@ -324 +324 @@
   if (!DET->FLAG_bfield ) return;
 
-  q  = Charge(Part->PID);
+  q  = ChargeVal(Part->PID);
   if(q==0) return;
   if(R_max ==0) { cout << "ERROR: magnetic field has no lateral extention\n"; return;}

trunk/src/HEPEVTConverter.cc

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

trunk/src/STDHEPConverter.cc

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

trunk/src/SmearUtil.cc

@@ -1105 +1105 @@
 }
 
-int Charge(const int pid)
+int ChargeVal(const int pid)
 {
   int charge;