Changes between Version 24 and Version 25 of WorkBook/LibraryInterface

Timestamp:

Nov 13, 2012, 5:36:14 PM (12 years ago)

Author:

Pavel Demin

Comment:

--

WorkBook/LibraryInterface

@@ -9 +9 @@
   setup ROOT environment variables
 
-  wget --no-check-certificate https://server06.fynu.ucl.ac.be/projects/delphes/raw-attachment/wiki/LibraryInterface/ModularDelphes.tar.gz
+  wget --no-check-certificate https://cp3.irmp.ucl.ac.be/projects/delphes/raw-attachment/wiki/LibraryInterface/ModularDelphes.tar.gz
   tar -zxf ModularDelphes.tar.gz
 
@@ -44 +44 @@
 
 #include "TObjArray.h"
+#include "TDatabasePDG.h"
+#include "TParticlePDG.h"
 #include "TLorentzVector.h"
 
-#include "ExRootAnalysis/ExRootFactory.h"
-#include "ExRootAnalysis/ExRootAnalysis.h"
-#include "ExRootAnalysis/ExRootCandidate.h"
+#include "modules/Delphes.h"
+#include "classes/DelphesClasses.h"
+#include "classes/DelphesFactory.h"
 
 using namespace std;
 
-void ConvertInput(ExRootFactory *factory, TObjArray *particleOutputArray, TObjArray *partonOutputArray);
+void ConvertInput(DelphesFactory *factory, TObjArray *particleOutputArray, TObjArray *candidateOutputArray, TObjArray *partonOutputArray);
 
-void ConvertOutput(ExRootAnalysis *modularDelphes);
+void ConvertOutput(Delphes *modularDelphes);
 
 bool ReadEvent() { return true; }
@@ -64 +66 @@
   // Declaration of variables
   ExRootConfReader *confReader;
-  ExRootAnalysis *modularDelphes;
-  ExRootFactory *factory;
+  Delphes *modularDelphes;
+  DelphesFactory *factory;
   TObjArray *particleOutputArray;
+  TObjArray *candidateOutputArray;
   TObjArray *partonOutputArray;
 
@@ -82 +85 @@
     confReader->ReadFile("etc/delphes_card_CMS.tcl");
 
-    modularDelphes = new ExRootAnalysis("Delphes");
+    modularDelphes = new Delphes("Delphes");
     modularDelphes->SetConfReader(confReader);
     
     factory = modularDelphes->GetFactory();
+
     particleOutputArray = modularDelphes->ExportArray("particles");
+    candidateOutputArray = modularDelphes->ExportArray("candidates");
     partonOutputArray = modularDelphes->ExportArray("partons");
 
@@ -95 +100 @@
     {
       modularDelphes->Clear();
-      ConvertInput(factory, particleOutputArray, partonOutputArray); 
+      ConvertInput(factory, particleOutputArray, candidateOutputArray, partonOutputArray); 
       modularDelphes->ProcessTask();
       ConvertOutput(modularDelphes);
@@ -113 +118 @@
 }
 
-void ConvertInput(ExRootFactory *factory, TObjArray *particleOutputArray, TObjArray *partonOutputArray)
+void ConvertInput(DelphesFactory *factory, TObjArray *particleOutputArray, TObjArray *candidateOutputArray, TObjArray *partonOutputArray)
 {
-  ExRootCandidate *candidate;
-  TLorentzVector candidateMomentum, candidatePosition;
+  Candidate *candidate;
+  TDatabasePDG *pdg;
+  TParticlePDG *pdgParticle;
   Int_t pid, status;
-  Double_t px, py, pz, e, m;
+  Double_t px, py, pz, e;
   Double_t x, y, z, t;  
 
+  pdg = TDatabasePDG::Instance()
+  
   while(ReadParticle())
   {
@@ -127 +135 @@
       candidate = factory->NewCandidate();
 
-      candidate->SetType(pid);
+      candidate->PID = pid;
 
-      candidateMomentum.SetPxPyPzE(px, py, pz, e);
-      candidate->SetMomentum(candidateMomentum);
+      candidate->Status = status;
 
-      candidatePosition.SetXYZT(x, y, z, t);
-      candidate->SetPosition(candidatePosition);
+      
+      pdgParticle = pdg->GetParticle(fPID);
+      candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
+      candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
+  
+      candidate->Momentum.SetPxPyPzE(px, py, pz, e);
+
+      candidate->Position.SetXYZT(x, y, z, t);
+
+      particleOutputArray->Add(candidate);
+
+      if(!pdgParticle) return;
 
       if(status == 1)
       {
-        particleOutputArray->Add(candidate);
+        candidateOutputArray->Add(candidate);
       }
       else if(status == 2)
@@ -147 +164 @@
 }
 
-void ConvertOutput(ExRootAnalysis *modularDelphes)
+void ConvertOutput(Delphes *modularDelphes)
 {
   const TObjArray *arrayJets = modularDelphes->ImportArray("FastJetFinder/jets");
   TIter iteratorJets(arrayJets);
-  ExRootCandidate *candidate;
+  Candidate *candidate;
 
   iteratorJets.Reset();
-  while((candidate = static_cast<ExRootCandidate*>(iteratorJets.Next())))
+  while((candidate = static_cast<Candidate*>(iteratorJets.Next())))
   {
     const TLorentzVector &momentum = candidate->GetMomentum();