Changes between Version 16 and Version 17 of WorkBook/LibraryInterface

Timestamp:

Jun 22, 2012, 12:15:38 AM (12 years ago)

Author:

Pavel Demin

Comment:

--

WorkBook/LibraryInterface

@@ -56 +56 @@
   ExRootAnalysis *modularDelphes;
   ExRootFactory *factory;
-  TObjArray *outputArray;
+  TObjArray *particleOutputArray;
+  TObjArray *partonOutputArray;
 
   gROOT->SetBatch();
@@ -76 +77 @@
     
     factory = modularDelphes->GetFactory();
-    outputArray = modularDelphes->ExportArray("candidates");
+    particleOutputArray = modularDelphes->ExportArray("particles");
+    partonOutputArray = modularDelphes->ExportArray("partons");
 
     modularDelphes->InitTask();
@@ -84 +86 @@
     {
       modularDelphes->Clear();
-      ConvertEvent(factory, outputArray);         
+      ConvertInput(factory, particleOutputArray, partonOutputArray); 
       modularDelphes->ProcessTask();
-      ReadResults(modularDelphes);
+      ConvertOutput(modularDelphes);
     }
 
@@ -102 +104 @@
 }
 
-
-void ConvertEvent(ExRootFactory *factory, TObjArray *outputArray)
+void ConvertInput(ExRootFactory *factory, TObjArray *particleOutputArray, TObjArray *partonOutputArray)
 {
   ExRootCandidate *candidate;
@@ -110 +111 @@
   Double_t px, py, pz, e, m;  
   Double_t x, y, z, t;  
-  
+
   while(ReadParticle())
   {
-    if(status == 1)
+    if(status == 1 || status == 2)
     {
       candidate = factory->NewCandidate();
-      
+
       candidate->SetType(pid);
 
       candidateMomentum.SetPxPyPzE(px, py, pz, e);
       candidate->SetMomentum(candidateMomentum);
-      
+
       candidatePosition.SetXYZT(x, y, z, t);
       candidate->SetPosition(candidatePosition);
-      
-      outputArray->Add(candidate);
+
+      if(status == 1)
+      {
+        particleOutputArray->Add(candidate);
+      }
+      else if(status == 2)
+      {
+        partonOutputArray->Add(candidate);
+      }
     }
   }
 }
 
-void ReadResults(ExRootAnalysis *modularDelphes)
+void ConvertOutput(ExRootAnalysis *modularDelphes)
 {
   TObjArray *arrayJets = modularDelphes->ImportArray("FastJetFinder/jets");