Changeset 355 in svn

Timestamp:

May 6, 2009, 9:37:14 PM (16 years ago)

Author:

Xavier Rouby

Message:

update

Location:

trunk/src

Files:

• HEPMCConverter.cc (deleted)
• VeryForward.cc (modified) (5 diffs)

trunk/src/VeryForward.cc

@@ -117 +117 @@
 {
   int pid=abs(particle->PID);
-  float eta=fabs(particle->Eta);
-  
-  
   TRootZdcHits *elementZdc;
   TLorentzVector genMomentum; 
   // Zero degree calorimeter, for forward neutrons and photons
-  if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && eta > DET->VFD_min_zdc ) {
+  if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && fabs(particle->Eta) > DET->VFD_min_zdc ) {
     genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
     // !!!!!!!!! vérifier que particle->Z est bien en micromÚtres!!!
@@ -136 +133 @@
     //double theta = (1E-6)*sqrt( pow(tx,2) + pow(ty,2) );
     //double flight_distance = (DET->ZDC_S - particle->Z*(1E-6))/cos(theta) ; // assumes that Z is in micrometers
-    double flight_distance = (DET->VFD_s_zdc - particle->Z*(1E-6));
+    double flight_distance = DET->VFD_s_zdc - particle->Z*(1E-6);
     // assumes also that the emission angle is so small that 1/(cos theta) = 1
-    elementZdc->T = 0*particle->T + flight_distance/speed_of_light; // assumes highly relativistic particles
-    elementZdc->side = sign(eta);
+    elementZdc->T = particle->T + flight_distance/speed_of_light; // assumes highly relativistic particles
+cout << "ZDC: T = " << particle->T << " ; " << flight_distance/speed_of_light << endl;
+    elementZdc->side = sign(particle->Eta);
     
     
@@ -147 +145 @@
 void VeryForward::RomanPots(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchRP220,ExRootTreeBranch *branchFP420,TRootGenParticle *particle) 
 {
-  int pid=abs(particle->PID);
-  float eta=fabs(particle->Eta);
+  int pid=particle->PID;
   
   TRootRomanPotHits* elementRP220;
@@ -180 +177 @@
           elementRP220->Ty = (1E-6)*p1.getTY(); // [rad]
           elementRP220->S = p1.getS();          // [m]
-          elementRP220->T = -1;                 // not yet implemented
-          elementRP220->E = p1.getE();  // not yet implemented
+          // in first approximation only ! this number is always lower than the real distance-of-flight
+          double flight_distance = p1.getS() - particle->Z*(1E-6); 
+          elementRP220->T = particle->T + flight_distance/speed_of_light; // assumes highly relativistic particles
+cout << "T = " << particle->T << " ; " << flight_distance/speed_of_light << endl;
+          elementRP220->E = p1.getE();          // not yet implemented
           elementRP220->q2 = -1;                // not yet implemented
-          elementRP220->side = sign(eta);
+          elementRP220->side = sign(particle->Eta);
           
         } else if (p1.getStoppingElement()->getName()=="rp420_1" || p1.getStoppingElement()->getName()=="rp420_2") {
@@ -192 +192 @@
           elementFP420->Tx = (1E-6)*p1.getTX(); // [rad]
           elementFP420->Ty = (1E-6)*p1.getTY(); // [rad]
-          elementFP420->S = p1.getS();        // [m]
-          elementFP420->T = -1;                       // not yet implemented
+          elementFP420->S = p1.getS();          // [m]
+          // in first approximation only ! this number is always lower than the real distance-of-flight
+          double flight_distance = p1.getS() - particle->Z*(1E-6);
+cout << "T = " << particle->T << " ; " << flight_distance/speed_of_light << endl;
+          elementFP420->T = particle->T + flight_distance/speed_of_light;
           elementFP420->E = p1.getE();          // not yet implemented
           elementFP420->q2 = -1;                // not yet implemented
-          elementFP420->side = sign(eta);
+          elementFP420->side = sign(particle->Eta);
         }
 
       }
-      //                if(p1.stopped(beamline) && (p1.getStoppingElement()->getS() > 100))
-      //                        cout << "Eloss ="  << 7000.-p1.getE() << " ; " << p1.getStoppingElement()->getName() << endl;
+      //  if(p1.stopped(beamline) && (p1.getStoppingElement()->getS() > 100))
+      //     cout << "Eloss ="  << 7000.-p1.getE() << " ; " << p1.getStoppingElement()->getName() << endl;
     } // if forward proton
 }
 
     // Forward particles in CASTOR ?
-    //           /*      if (particle->Status == 1 && (fabs(particle->Eta) > DET->MIN_CALO_VFWD)
-    //                             && (fabs(particle->Eta) < DET->MAX_CALO_VFWD)) {
+    //    if (particle->Status == 1 && (fabs(particle->Eta) > DET->MIN_CALO_VFWD)
+    //                              && (fabs(particle->Eta) < DET->MAX_CALO_VFWD)) {
     //
     //
-    //                                               } // CASTOR
-    //                                                         */
-    //
+    //    } // CASTOR
+    // */
+