replace examples by cards

dr-stringfellow · Dec 11, 2014 · a8782e8 · a8782e8
1 parent 8e602e5
commit a8782e8
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 8 deletions.
diff --git a/README b/README
@@ -29,11 +29,11 @@ Let's simulate some Z->ee events:
 
    wget http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz
    gunzip z_ee.hep.gz
-   ./DelphesSTDHEP examples/delphes_card_CMS.tcl delphes_output.root z_ee.hep
+   ./DelphesSTDHEP cards/delphes_card_CMS.tcl delphes_output.root z_ee.hep
 
 or
 
-   curl -s http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz | gunzip | ./DelphesSTDHEP examples/delphes_card_CMS.tcl delphes_output.root
+   curl -s http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz | gunzip | ./DelphesSTDHEP cards/delphes_card_CMS.tcl delphes_output.root
 
 For more detailed documentation, please visit 
 

diff --git a/README.md b/README.md
@@ -38,13 +38,13 @@ Let's simulate some Z->ee events:
 ```
 wget http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz
 gunzip z_ee.hep.gz
-./DelphesSTDHEP examples/delphes_card_CMS.tcl delphes_output.root z_ee.hep
+./DelphesSTDHEP cards/delphes_card_CMS.tcl delphes_output.root z_ee.hep
 ```
 
 or
 
 ```
-curl -s http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz | gunzip | ./DelphesSTDHEP examples/delphes_card_CMS.tcl delphes_output.root
+curl -s http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz | gunzip | ./DelphesSTDHEP cards/delphes_card_CMS.tcl delphes_output.root
 ```
 
 For more detailed documentation, please visit 

diff --git a/README_4LHCb b/README_4LHCb
@@ -52,7 +52,7 @@ Quick start with Delphes
 
   wget http://cp3.irmp.ucl.ac.be/downloads/pp2bb.hep.tgz
   tar -xzvf pp2bb.hep.tgz
-  ./DelphesSTDHEP examples/delphes_card_prelLHCb.tcl delphes_output.root pp2bb.hep
+  ./DelphesSTDHEP cards/delphes_card_prelLHCb.tcl delphes_output.root pp2bb.hep
 
 
 For more details, please visit:

diff --git a/examples/DelphesBrowser.C b/examples/DelphesBrowser.C
@@ -17,12 +17,12 @@ root -l examples/DelphesBrowser.C
   TObjArray *stableParticleOutputArray = modularDelphes->ExportArray("stableParticles");
   TObjArray *partonOutputArray = modularDelphes->ExportArray("partons");
 
-  confReader->ReadFile("examples/delphes_card_CMS.tcl");
+  confReader->ReadFile("cards/delphes_card_CMS.tcl");
 
   modularDelphes->SetConfReader(confReader);
   modularDelphes->SetTreeWriter(treeWriter);
 
   modularDelphes->InitTask();
 
   TBrowser browser;
-}
+}
diff --git a/examples/ExternalFastJetBasic.cpp b/examples/ExternalFastJetBasic.cpp
@@ -16,6 +16,31 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+
+First, you need to set DELPHES_DIR, FASTJET_DIR and ROOT_DIR:
+
+DELPHES_DIR=<path to Delphes installation>
+FASTJET_DIR=<path to FastJet installation>
+ROOT_DIR=<path to ROOT installation>
+
+Then run the following commands to build ExternalFastJetBasic:
+
+DELPHES_LIB="-L$DELPHES_DIR -lDelphesNoFastJet"
+
+FASTJET_INC=`$FASTJET_DIR/bin/fastjet-config --cxxflags`
+FASTJET_LIB=`$FASTJET_DIR/bin/fastjet-config --libs`
+
+ROOT_INC=`$ROOT_DIR/bin/root-config --incdir`
+ROOT_LIB=`$ROOT_DIR/bin/root-config --libs`
+
+CXXFLAGS="$FASTJET_INC -I$ROOT_INC -I$DELPHES_DIR -I$DELPHES_DIR/external"
+LDFLAGS="$FASTJET_LIB $ROOT_LIB $DELPHES_LIB"
+
+g++ $CXXFLAGS $LDFLAGS ExternalFastJetBasic.cpp -o ExternalFastJetBasic
+
+*/
+
 #include <stdexcept>
 #include <iostream>
 #include <sstream>

diff --git a/examples/ExternalFastJetHepMC.cpp b/examples/ExternalFastJetHepMC.cpp
@@ -16,6 +16,31 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+
+First, you need to set DELPHES_DIR, FASTJET_DIR and ROOT_DIR:
+
+DELPHES_DIR=<path to Delphes installation>
+FASTJET_DIR=<path to FastJet installation>
+ROOT_DIR=<path to ROOT installation>
+
+Then run the following commands to build ExternalFastJetHepMC:
+
+DELPHES_LIB="-L$DELPHES_DIR -lDelphesNoFastJet"
+
+FASTJET_INC=`$FASTJET_DIR/bin/fastjet-config --cxxflags`
+FASTJET_LIB=`$FASTJET_DIR/bin/fastjet-config --libs`
+
+ROOT_INC=`$ROOT_DIR/bin/root-config --incdir`
+ROOT_LIB=`$ROOT_DIR/bin/root-config --libs`
+
+CXXFLAGS="$FASTJET_INC -I$ROOT_INC -I$DELPHES_DIR -I$DELPHES_DIR/external"
+LDFLAGS="$FASTJET_LIB $ROOT_LIB $DELPHES_LIB"
+
+g++ $CXXFLAGS $LDFLAGS ExternalFastJetHepMC.cpp -o ExternalFastJetHepMC
+
+*/
+
 #include <stdexcept>
 #include <iostream>
 #include <sstream>

diff --git a/modules/Hector.cc b/modules/Hector.cc
@@ -89,7 +89,7 @@ void Hector::Init()
   fEtaMin = GetDouble("EtaMin", 5.0);
 
   fBeamLine = new H_BeamLine(fDirection, fBeamLineLength + 0.1);
-  fBeamLine->fill(GetString("BeamLineFile", "examples/LHCB1IR5_5TeV.tfs"), fDirection, GetString("IPName", "IP5"));
+  fBeamLine->fill(GetString("BeamLineFile", "cards/LHCB1IR5_5TeV.tfs"), fDirection, GetString("IPName", "IP5"));
   fBeamLine->offsetElements(fOffsetS, fOffsetX);
   fBeamLine->calcMatrix();