Changeset 385 in svn for trunk

Timestamp:

May 15, 2009, 7:29:49 PM (15 years ago)

Author:

Xavier Rouby

Message:

not final

Location:

trunk

Files:

• interface/VeryForward.h (modified) (1 diff)
• src/VeryForward.cc (modified) (6 diffs)

trunk/interface/VeryForward.h

@@ -69 +69 @@
    bool relative_energy;
    int kickers_on;
-
+   static unsigned int counter;
 
 };

trunk/src/VeryForward.cc

@@ -91 +91 @@
 void VeryForward::init() { 
   //Initialisation of Hector
+  static unsigned int counter;
+  counter =0;
   relative_energy = true; // should always be true
   kickers_on = 1;         // should always be 1
@@ -122 +124 @@
                            && fabs(particle->Eta) > DET->VFD_min_zdc ) {
     elementZdc = (TRootZdcHits*) branchZDC->NewEntry();
+
+
+    elementZdc->pid = particle->PID;
 
      
@@ -192 +197 @@
   
   // to go faster, why not rejecting particles already going into the ZDC?
+  if( particle->PID == pP) 
   if( (particle->Status == 1) &&  (fabs(genMomentum.Eta()) > DET->CEN_max_calo_fwd) )
     {
       //cout << "VeryForward :: M = " << mass << "\t Q = " << charge << "\t\t " << particle->PID << endl;
-      H_BeamParticle p1(mass,charge); /// put here particle->CHARGE and particle->MASS
+      H_BeamParticle p1(mass,charge); 
       p1.smearAng();   p1.smearPos(); // vertex smearing
-      p1.setPosition(p1.getX()+DET->RP_cross_x,p1.getY()+DET->RP_cross_y,p1.getTX()-1*kickers_on*DET->RP_cross_ang,p1.getTY(),0);
-      p1.set4Momentum(particle->Px,particle->Py,particle->Pz,particle->E);
-      
+        cout << "x = " << p1.getX() + DET->RP_cross_x 
+             << " y= " << p1.getY() + DET->RP_cross_y 
+             << " tx= " << p1.getTX() - kickers_on*DET->RP_cross_ang 
+             << " ty=" << p1.getTY() << endl;
+      p1.setPosition(p1.getX()+DET->RP_cross_x,p1.getY()+DET->RP_cross_y,p1.getTX()-kickers_on*DET->RP_cross_ang,p1.getTY(),0);
+      //p1.set4Momentum(particle->Px,particle->Py,particle->Pz,particle->E);
+      p1.setE(particle->E);
+       
       H_BeamLine *beamline;
       if(genMomentum.Eta() >0) beamline = beamline1;
@@ -208 +219 @@
       if(p1.stopped(beamline)) {
         if (p1.getStoppingElement()->getName()=="rp220_1" || p1.getStoppingElement()->getName()=="rp220_2") {
+          static unsigned int counter;
+          counter++;
+          if (counter==1) {
+                p1.getPath(0,"p1path.txt");
+                cout << "RP : " << particle->PID << "\t" << charge << "=" << particle->Charge 
+                     << "\t" << mass << "=" << particle->M 
+                     << "\t E=" << particle->E 
+                     << endl;           
+          }
           p1.propagate(DET->RP_220_s);
           elementRP220 = (TRootRomanPotHits*) branchRP220->NewEntry();
@@ -238 +258 @@
             elementRP220->q2 = -1;                // not yet implemented
             elementRP220->side = sign(particle->Eta);
+
+
+                elementRP220->pid = particle->PID;
           
         } else if (p1.getStoppingElement()->getName()=="rp420_1" || p1.getStoppingElement()->getName()=="rp420_2") {
@@ -270 +293 @@
           elementFP420->q2 = -1;                // not yet implemented
           elementFP420->side = sign(particle->Eta);
+
+
+                elementFP420->pid = particle->PID;
         }