Changeset 94 in svn for trunk/src/VeryForward.cc

Timestamp:

Dec 12, 2008, 5:32:29 PM (16 years ago)

Author:

severine ovyn

Message:

Add frog plus cleaning + bugs remove

File:

• trunk/src/VeryForward.cc (modified) (5 diffs)

trunk/src/VeryForward.cc

@@ -62 +62 @@
   TLorentzVector genMomentum; 
   // Zero degree calorimeter, for forward neutrons and photons
-  if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && eta > MIN_ZDC ) {
+  if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && eta > VFD_min_zdc ) {
     genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
     // !!!!!!!!! vérifier que particle->Z est bien en micromÚtres!!!
@@ -75 +75 @@
     //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 = (ZDC_S - particle->Z*(1E-6));
+    double flight_distance = (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
@@ -95 +95 @@
   genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
   // if forward proton
-  if( (pid == pP)  && (particle->Status == 1) &&  (fabs(genMomentum.Eta()) > MAX_CALO_FWD) )
+  if( (pid == pP)  && (particle->Status == 1) &&  (fabs(genMomentum.Eta()) > CEN_max_calo_fwd) )
     {
       // !!!!!!!! put here particle->CHARGE and particle->MASS
@@ -112 +112 @@
       if(p1.stopped(beamline)) {
         if (p1.getStoppingElement()->getName()=="rp220_1" || p1.getStoppingElement()->getName()=="rp220_2") {
-          p1.propagate(RP220_S);
+          p1.propagate(RP_220_s);
           elementRP220 = (TRootRomanPotHits*) branchRP220->NewEntry();
           elementRP220->X  = (1E-6)*p1.getX();  // [m]
@@ -125 +125 @@
           
         } else if (p1.getStoppingElement()->getName()=="rp420_1" || p1.getStoppingElement()->getName()=="rp420_2") {
-          p1.propagate(FP420_S);
+          p1.propagate(RP_420_s);
           elementFP420 = (TRootRomanPotHits*) branchFP420->NewEntry();
           elementFP420->X  = (1E-6)*p1.getX();  // [m]