Changeset 264 in svn for trunk/src/BFieldProp.cc

Timestamp:

Feb 11, 2009, 10:22:30 AM (15 years ago)

Author:

Xavier Rouby

Message:

first test 2.0

File:

• trunk/src/BFieldProp.cc (modified) (6 diffs)

trunk/src/BFieldProp.cc

@@ -36 +36 @@
 
 //------------------------------------------------------------------------------
+extern const float UNDEFINED;
 
 TrackPropagation::TrackPropagation(){
@@ -315 +316 @@
 
 
-void TrackPropagation::bfield(const TRootGenParticle *Part, float& etacalo, float& phicalo) {
+void TrackPropagation::bfield(TRootGenParticle *Part) {
 
   // initialisation, valid for z_max==0, R_max==0 and q==0
-  etacalo = Part->Eta;
-  phicalo = -atan2(Part->Px,Part->Py);
+  Part->EtaCalo = Part->Eta;
+  Part->PhiCalo = Part->Phi;//-atan2(Part->Px,Part->Py);
+
+  if (!DET->FLAG_bfield ) return;
 
   q  = Charge(Part->PID);
@@ -386 +389 @@
               Eta_t = - log(tan(Theta_t/2.));
       } else{
-                Theta_t=0; Eta_t = 9999;
+                Theta_t=0; Eta_t = UNDEFINED;
       }
 /*      Not needed here. but these formulae are correct -------
@@ -399 +402 @@
         momentum.SetPxPyPzE(Px_t,Py_t,Pz_t,E_t);
 */
-        etacalo = Eta_t;
-        phicalo = Phi_t;
+        Part->EtaCalo = Eta_t;
+        Part->PhiCalo = Phi_t;
         return;
 // test zone ---
@@ -436 +439 @@
 
   } else { // if B_x or B_y are non zero: longer computation
-
+//cout << "bfield de loic\n";
   float Xvertex1 = Part->X;
   float Yvertex1 = Part->Y;
@@ -511 +514 @@
   if(x!=0 && y!=0 && z!=0) {
           Theta = atan2(sqrt(r2),z);
-          etacalo  = -log(tan(Theta/2.));
-          phicalo = atan2(y,x);
+          Part->EtaCalo  = -log(tan(Theta/2.));
+          Part->PhiCalo = atan2(y,x);
           //momentum.SetPtEtaPhiE(Part->PT,eta,phi,Part->E);
   }