Changes in modules/PileUpMerger.cc [3e2bb2b:2d494a6] in git

File:

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

modules/PileUpMerger.cc

@@ -115 +115 @@
   TDatabasePDG *pdg = TDatabasePDG::Instance();
   TParticlePDG *pdgParticle;
-  Int_t pid, nch, nvtx = -1;
+  Int_t pid;
   Float_t x, y, z, t, vx, vy;
-  Float_t px, py, pz, e, pt;
-  Double_t dz, dphi, dt, sumpt2, dz0, dt0;
+  Float_t px, py, pz, e;
+  Double_t dz, dphi, dt;
   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
-
-  //cout<<dz<<","<<dt<<endl;
-
   vx = 0.0;
   vy = 0.0;
-
   numberOfParticles = fInputArray->GetEntriesFast();
-  nch = 0;
-  sumpt2 = 0.0;
-
-  factory = GetFactory();
-  vertex = factory->NewCandidate();
-
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
@@ -156 +143 @@
     z = candidate->Position.Z();
     t = candidate->Position.T();
-    pt = candidate->Momentum.Pt();
-
-    // 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);
-
-    candidate->IsPU = 0;
-
+    candidate->Position.SetZ(z + dz);
+    candidate->Position.SetT(t + dt);
     fParticleOutputArray->Add(candidate);
-
-    if(TMath::Abs(candidate->Charge) >  1.0E-9)
-    {
-      nch++;
-      sumpt2 += pt*pt;
-      vertex->AddCandidate(candidate);
-    }
   }
 
   if(numberOfParticles > 0)
   {
-    vx /= sumpt2;
-    vy /= sumpt2;
-  }
-
-  nvtx++;
+    vx /= numberOfParticles;
+    vy /= numberOfParticles;
+  }
+
+  factory = GetFactory();
+
+  vertex = factory->NewCandidate();
   vertex->Position.SetXYZT(vx, vy, dz, dt);
-  vertex->ClusterIndex = nvtx;
-  vertex->ClusterNDF = nch;
-  vertex->SumPT2 = sumpt2;
-  vertex->GenSumPT2 = sumpt2;
   fVertexOutputArray->Add(vertex);
 
@@ -204 +170 @@
       numberOfEvents = gRandom->Integer(2*fMeanPileUp + 1);
       break;
-    case 2:
-      numberOfEvents = fMeanPileUp;
-      break;
     default:
       numberOfEvents = gRandom->Poisson(fMeanPileUp);
@@ -213 +176 @@
 
   allEntries = fReader->GetEntries();
-
 
   for(event = 0; event < numberOfEvents; ++event)
@@ -236 +198 @@
     vx = 0.0;
     vy = 0.0;
-
     numberOfParticles = 0;
-    sumpt2 = 0.0;
-
-    //factory = GetFactory();
-    vertex = factory->NewCandidate();
-
     while(fReader->ReadParticle(pid, x, y, z, t, px, py, pz, e))
     {
@@ -259 +215 @@
       candidate->Momentum.SetPxPyPzE(px, py, pz, e);
       candidate->Momentum.RotateZ(dphi);
-      pt = candidate->Momentum.Pt();
 
       x -= fInputBeamSpotX;
@@ -269 +224 @@
       vx += candidate->Position.X();
       vy += candidate->Position.Y();
-
       ++numberOfParticles;
-      if(TMath::Abs(candidate->Charge) >  1.0E-9)
-      {
-        nch++;
-        sumpt2 += pt*pt;
-        vertex->AddCandidate(candidate);
-      }
 
       fParticleOutputArray->Add(candidate);
@@ -287 +235 @@
     }
 
-    nvtx++;
-
+    vertex = factory->NewCandidate();
     vertex->Position.SetXYZT(vx, vy, dz, dt);
-
-    vertex->ClusterIndex = nvtx;
-    vertex->ClusterNDF = nch;
-    vertex->SumPT2 = sumpt2;
-    vertex->GenSumPT2 = sumpt2;
-
     vertex->IsPU = 1;
 
     fVertexOutputArray->Add(vertex);
-
-  }
-}
-
-//------------------------------------------------------------------------------
+  }
+}
+
+//------------------------------------------------------------------------------