Changeset 50edcdbf in git

Timestamp:

Jun 4, 2016, 8:06:02 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3f8df25

Parents:

7bcca65

Message:

reset eventual z,t shift

File:

• modules/PileUpMerger.cc (modified) (5 diffs)

modules/PileUpMerger.cc

@@ -118 +118 @@
   Float_t x, y, z, t, vx, vy, vz, vt;
   Float_t px, py, pz, e, pt;
-  Double_t dz, dphi, dt, sumpt2;
+  Double_t dz, dphi, dt, sumpt2, dz0, dt0;
   Int_t numberOfEvents, event, numberOfParticles;
   Long64_t allEntries, entry;
@@ -132 +132 @@
   fFunction->GetRandom2(dz, dt);
 
+  dz0 = -1.0e6;
+  dt0 = -1.0e6;
+
   dt *= c_light*1.0E3; // necessary in order to make t in mm/c
   dz *= 1.0E3; // necessary in order to make z in mm
+  
   vx = 0.0;
   vy = 0.0;
@@ -151 +155 @@
     pt = candidate->Momentum.Pt();
     
-    vz += z+dz;
-    vt += t+dt;
-    
-    candidate->Position.SetZ(z + dz);
-    candidate->Position.SetT(t + dt);
+    // take postion and time from first stable particle
+    if (dz0 < -999999.0)
+      dz0 = z;
+    if (dt0 < -999999.0)
+      dt0 = t;
+
+    // cancel any possible offset in position and time the input file
+    candidate->Position.SetZ(z - dz0 + dz);
+    candidate->Position.SetT(t - dt0 + dt);
+    
+    vz += z - dz0 + dz;
+    vt += t - dt0 + dt;
+    
     fParticleOutputArray->Add(candidate);
  
@@ -170 +182 @@
     vy /= numberOfParticles;
     vz /= numberOfParticles;
-    vt /= numberOfParticles;
-  
+    vt /= numberOfParticles; 
   }
 
@@ -256 +267 @@
       vx += candidate->Position.X();
       vy += candidate->Position.Y();
+      vz += z+dz;
+      vt += t+dt;
       
       ++numberOfParticles;