Changeset 8d601b7 in git for modules

Timestamp:

Jun 6, 2016, 10:22:47 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

e2148f0

Parents:

c4a72a0

Message:

fixed vertex z position, go back to A. Hart solution

File:

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

modules/PileUpMerger.cc

@@ -116 +116 @@
   TParticlePDG *pdgParticle;
   Int_t pid, nch, nvtx = -1;
-  Float_t x, y, z, t, vx, vy, vz, vt;
+  Float_t x, y, z, t, vx, vy;
   Float_t px, py, pz, e, pt;
   Double_t dz, dphi, dt, sumpt2, dz0, dt0;
@@ -134 +134 @@
   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
   
+  //cout<<dz<<","<<dt<<endl;
+ 
   vx = 0.0;
   vy = 0.0;
-  vz = 0.0;
-  vt = 0.0;
   
   numberOfParticles = fInputArray->GetEntriesFast();
   nch = 0;
   sumpt2 = 0.0; 
-    
+   
+  cout<<"candidate loop"<<endl;  
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
@@ -154 +155 @@
     t = candidate->Position.T();
     pt = candidate->Momentum.Pt();
-    
+       
     // take postion and time from first stable particle
     if (dz0 < -999999.0)
@@ -164 +165 @@
     candidate->Position.SetZ(z - dz0 + dz);
     candidate->Position.SetT(t - dt0 + dt);
-    
-    vz += z - dz0 + dz;
-    vt += t - dt0 + dt;
     
     fParticleOutputArray->Add(candidate);
@@ -176 +174 @@
     }  
   }
-
+ 
   if(numberOfParticles > 0)
   {
-    vx /= numberOfParticles;
-    vy /= numberOfParticles;
-    vz /= numberOfParticles;
-    vt /= numberOfParticles; 
+    vx /= sumpt2;
+    vy /= sumpt2;
   }
-
+  
   nvtx++;
   factory = GetFactory();
 
+  cout<<"vertex position"<<endl;
+  //cout<<vz<<","<<vt<<endl;
   vertex = factory->NewCandidate();
-  vertex->Position.SetXYZT(vx, vy, vz, vt);
+  vertex->Position.SetXYZT(vx, vy, dz, dt);
   vertex->ClusterIndex = nvtx;
   vertex->ClusterNDF = nch;