Changes between Version 35 and Version 36 of WorkBook/LibraryInterface

Timestamp:

Feb 25, 2013, 10:54:16 PM (12 years ago)

Author:

Pavel Demin

Comment:

--

WorkBook/LibraryInterface

@@ -9 +9 @@
 setup ROOT environment variables
 
-wget --no-check-certificate https://cp3.irmp.ucl.ac.be/projects/delphes/raw-attachment/wiki/WikiStart/Delphes-3.0.0.tar.gz
-tar -zxf Delphes-3.0.0.tar.gz
+wget --no-check-certificate http://cp3.irmp.ucl.ac.be/downloads/Delphes-3.0.1.tar.gz
+tar -zxf Delphes-3.0.1.tar.gz
 
-cd Delphes-3.0.0
+cd Delphes-3.0.1
 make -j 4
 
@@ -56 +56 @@
 using namespace std;
 
-void ConvertInput(DelphesFactory *factory, TObjArray *particleOutputArray, TObjArray *candidateOutputArray, TObjArray *partonOutputArray);
+void ConvertInput(DelphesFactory *factory, TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray);
 
 void ConvertOutput(Delphes *modularDelphes);
@@ -70 +70 @@
   Delphes *modularDelphes;
   DelphesFactory *factory;
-  TObjArray *particleOutputArray;
-  TObjArray *candidateOutputArray;
+  TObjArray *allParticleOutputArray;
+  TObjArray *stableParticleOutputArray;
   TObjArray *partonOutputArray;
 
@@ -92 +92 @@
     factory = modularDelphes->GetFactory();
 
-    particleOutputArray = modularDelphes->ExportArray("particles");
-    candidateOutputArray = modularDelphes->ExportArray("candidates");
+    allParticleOutputArray = modularDelphes->ExportArray("allParticles");
+    stableParticleOutputArray = modularDelphes->ExportArray("stableParticles");
     partonOutputArray = modularDelphes->ExportArray("partons");
 
@@ -102 +102 @@
     {
       modularDelphes->Clear();
-      ConvertInput(factory, particleOutputArray, candidateOutputArray, partonOutputArray); 
+      ConvertInput(factory, allParticleOutputArray, stableParticleOutputArray, partonOutputArray); 
       modularDelphes->ProcessTask();
       ConvertOutput(modularDelphes);
@@ -120 +120 @@
 }
 
-void ConvertInput(DelphesFactory *factory, TObjArray *particleOutputArray, TObjArray *candidateOutputArray, TObjArray *partonOutputArray)
+void ConvertInput(DelphesFactory *factory, TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
 {
   Candidate *candidate;
@@ -150 +150 @@
       candidate->Position.SetXYZT(x, y, z, t);
 
-      particleOutputArray->Add(candidate);
+      allParticleOutputArray->Add(candidate);
 
       if(!pdgParticle) return;
@@ -156 +156 @@
       if(status == 1)
       {
-        candidateOutputArray->Add(candidate);
+        stableParticleOutputArray->Add(candidate);
       }
       else if(status == 2)