Changeset 21eab4f in git for modules/PileUpMerger.cc

Timestamp:

Aug 26, 2016, 5:17:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

ec5e04b (diff), 94cacb6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

AlexandreMertens <alexandre.mertens@…> (08/26/16 17:17:14)

git-committer:

GitHub <noreply@…> (08/26/16 17:17:14)

Message:

Merge 94cacb6ab322f96b75a06369dfd9b7389d0d6802 into ec5e04b014990ea45a8708f4f726b6b214cdb82b

File:

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

modules/PileUpMerger.cc

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