Changeset 5496767 in git for modules

Timestamp:

Jun 17, 2016, 6:52:57 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

62d3bc5

Parents:

0f73bea

Message:

added array of constituents to vertices

Location:

modules

Files:

• PileUpMerger.cc (modified) (9 diffs)
• TreeWriter.cc (modified) (6 diffs)

modules/PileUpMerger.cc

@@ -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;
-  
+
   numberOfParticles = fInputArray->GetEntriesFast();
   nch = 0;
-  sumpt2 = 0.0; 
-   
+  sumpt2 = 0.0;
+
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
@@ -154 +154 @@
     t = candidate->Position.T();
     pt = candidate->Momentum.Pt();
-       
+
     // take postion and time from first stable particle
     if (dz0 < -999999.0)
@@ -164 +164 @@
     candidate->Position.SetZ(z - dz0 + dz);
     candidate->Position.SetT(t - dt0 + dt);
-    
+
     fParticleOutputArray->Add(candidate);
- 
+
     if(TMath::Abs(candidate->Charge) >  1.0E-9)
     {
-      nch++;    
+      nch++;
       sumpt2 += pt*pt;
-    }  
+    }
   }
- 
+
   if(numberOfParticles > 0)
   {
@@ -179 +179 @@
     vy /= sumpt2;
   }
-  
+
   nvtx++;
   factory = GetFactory();
@@ -188 +188 @@
   vertex->ClusterNDF = nch;
   vertex->SumPT2 = sumpt2;
-  vertex->GenSumPT2 = sumpt2; 
-  
+  vertex->GenSumPT2 = sumpt2;
+
   fVertexOutputArray->Add(vertex);
 
@@ -204 +204 @@
     case 2:
       numberOfEvents = fMeanPileUp;
-      break;   
+      break;
     default:
       numberOfEvents = gRandom->Poisson(fMeanPileUp);
@@ -233 +233 @@
     vx = 0.0;
     vy = 0.0;
-    
+
     numberOfParticles = 0;
     sumpt2 = 0.0;
-    
+
+    vertex = factory->NewCandidate();
+
     while(fReader->ReadParticle(pid, x, y, z, t, px, py, pz, e))
     {
@@ -262 +264 @@
       vx += candidate->Position.X();
       vy += candidate->Position.Y();
-      
+
       ++numberOfParticles;
       if(TMath::Abs(candidate->Charge) >  1.0E-9)
       {
-        nch++;    
+        nch++;
         sumpt2 += pt*pt;
-      } 
-       
+        vertex->AddCandidate(candidate);
+
+      }
+
       fParticleOutputArray->Add(candidate);
     }
@@ -278 +282 @@
       vy /= numberOfParticles;
     }
-    
+
     nvtx++;
 
-    vertex = factory->NewCandidate();
     vertex->Position.SetXYZT(vx, vy, dz, dt);
-    
-    vertex->ClusterIndex = nvtx; 
+
+    vertex->ClusterIndex = nvtx;
     vertex->ClusterNDF = nch;
     vertex->SumPT2 = sumpt2;
     vertex->GenSumPT2 = sumpt2;
-    
+
     vertex->IsPU = 1;
 
     fVertexOutputArray->Add(vertex);
-    
+
   }
 }

modules/TreeWriter.cc

@@ -240 +240 @@
 {
   TIter iterator(array);
-  Candidate *candidate = 0;
+  Candidate *candidate = 0, *constituent = 0;
   Vertex *entry = 0;
 
   const Double_t c_light = 2.99792458E8;
- 
+
   Double_t x, y, z, t, xError, yError, zError, sigma, sumPT2, btvSumPT2, genDeltaZ, genSumPT2;
   UInt_t index, ndf;
- 
+
   array->Sort();
- 
+
   // loop over all vertices
   iterator.Reset();
   while((candidate = static_cast<Candidate*>(iterator.Next())))
   {
-   
+
     index = candidate->ClusterIndex;
     ndf = candidate->ClusterNDF;
@@ -262 +262 @@
     genDeltaZ = candidate->GenDeltaZ;
     genSumPT2 = candidate->GenSumPT2;
-   
+
     x = candidate->Position.X();
     y = candidate->Position.Y();
     z = candidate->Position.Z();
     t = candidate->Position.T()*1.0E-3/c_light;
-  
+
     xError = candidate->PositionError.X ();
     yError = candidate->PositionError.Y ();
@@ -281 +281 @@
     entry->GenDeltaZ = genDeltaZ;
     entry->GenSumPT2 = genSumPT2;
-    
+
     entry->X = x;
     entry->Y = y;
     entry->Z = z;
     entry->T = t;
-    
+
     entry->ErrorX = xError;
     entry->ErrorY = yError;
     entry->ErrorZ = zError;
+
+    TIter itConstituents(candidate->GetCandidates());
+
+    while((constituent = static_cast<Candidate*>(itConstituents.Next())))
+    {
+      entry->Constituents.Add(constituent);
+    }
+
   }
 }
@@ -332 +340 @@
     entry->ZOuter = position.Z();
     entry->TOuter = position.T()*1.0E-3/c_light;
- 
+
     entry->L = candidate->L;
-  
+
     entry->D0            = candidate->D0;
     entry->ErrorD0       = candidate->ErrorD0;
@@ -346 +354 @@
     entry->ErrorCtgTheta = candidate->ErrorCtgTheta;
     entry->Phi           = candidate->Phi;
-    entry->ErrorPhi      = candidate->ErrorPhi; 
-    
+    entry->ErrorPhi      = candidate->ErrorPhi;
+
     entry->Xd = candidate->Xd;
     entry->Yd = candidate->Yd;
@@ -361 +369 @@
 
     entry->Eta = eta;
-    
+
     particle = static_cast<Candidate*>(candidate->GetCandidates()->At(0));
     const TLorentzVector &initialPosition = particle->Position;