Changes between Version 6 and Version 7 of WorkBook/ModuleSystem

Timestamp:

Nov 13, 2012, 5:39:21 PM (12 years ago)

Author:

Pavel Demin

Comment:

--

WorkBook/ModuleSystem

@@ -17 +17 @@
 #define ExampleModule_h
 
-#include "ExRootAnalysis/ExRootModule.h"
+#include "classes/DelphesModule.h"
 
 #include <deque>
 
 class TObjArray;
-class TFormula;
+class DelphesFormula;
 
-class ExampleModule: public ExRootModule
+class ExampleModule: public DelphesModule
 {
 public:
@@ -42 +42 @@
   std::deque <Double_t> fArrayParam;
   
-  TFormula *fFormula; //!
+  DelphesFormula *fFormula; //!
 
   TIterator *fItInputArray; //!
@@ -62 +62 @@
 #include "modules/ExampleModule.h"
 
+#include "classes/DelphesClasses.h"
+#include "classes/DelphesFactory.h"
+#include "classes/DelphesFormula.h"
+
 #include "ExRootAnalysis/ExRootResult.h"
-#include "ExRootAnalysis/ExRootClasses.h"
-
 #include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
 
-#include "ExRootAnalysis/ExRootFactory.h"
-#include "ExRootAnalysis/ExRootCandidate.h"
-
 #include "TMath.h"
-#include "TRandom.h"
 #include "TString.h"
 #include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
+#include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "TDatabasePDG.h"
-#include "TClonesArray.h"
 
+#include <algorithm> 
+#include <stdexcept>
 #include <iostream>
-#include <stdexcept>
 #include <sstream>
-#include <deque>
 
 using namespace std;
@@ -91 +90 @@
   fFormula(0), fItInputArray(0)
 {
-  fFormula = new TFormula;
+  fFormula = new DelphesFormula;
 }
 
@@ -143 +142 @@
 void ExampleModule::Process()
 {
-  ExRootCandidate *candidate;
+  Candidate *candidate;
   TLorentzVector candidatePosition, candidateMomentum;
 
   // loop over all input candidates
   fItInputArray->Reset();
-  while((candidate = static_cast<ExRootCandidate*>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
-    candidatePosition = candidate->GetPosition();
-    candidateMomentum = candidate->GetMomentum();
+    candidatePosition = candidate->Position;
+    candidateMomentum = candidate->Momentum;
 
     // apply an efficency formula
-    if(gRandom->Uniform() < fFormula->Eval(candidatePosition.Eta(), candidateMomentum.Pt()))
+    if(gRandom->Uniform() <= fFormula->Eval(candidateMomentum.Pt(), candidatePosition.Eta()))
     {
       fOutputArray->Add(candidate);