Changeset 181c061 in git for validation

Timestamp:

Apr 25, 2017, 5:37:05 PM (8 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

254db49, 76ef951

Parents:

88c03bc

Message:

rename Validation.cpp to DelphesValidation.cpp

Location:

validation

Files:

• DelphesValidation.cpp (moved) (moved from validation/Validation.cpp ) (4 diffs)
• validation.sh (modified) (1 diff)

validation/DelphesValidation.cpp

@@ -1451 +1451 @@
 
 
-void Validation(const char *inputFilePion,
-                const char *inputFileElectron,
-                const char *inputFileMuon,
-                const char *inputFilePhoton,
-                const char *inputFileNeutralHadron,
-                const char *inputFileJet,
-                const char *inputFileBJet,
-                const char *inputFileCJet,
-                const char *inputFileTauJet,
-                const char *outputFile,
-                const char *version)
+void DelphesValidation(
+  const char *inputFilePion,
+  const char *inputFileElectron,
+  const char *inputFileMuon,
+  const char *inputFilePhoton,
+  const char *inputFileNeutralHadron,
+  const char *inputFileJet,
+  const char *inputFileBJet,
+  const char *inputFileCJet,
+  const char *inputFileTauJet,
+  const char *outputFile,
+  const char *version)
 {
 
@@ -3036 +3037 @@
 int main(int argc, char *argv[])
 {
-  char *appName = "Validation";
+  char *appName = "DelphesValidation";
 
   if(argc != 12)
   {
-    cout << " Usage: " << appName << " input_file_electron input_file_muon input_file_photon input_file_jet input_file_bjet input_file_taujet output_file" << endl;
-    cout << " input_file_pion  - input file in ROOT format ('Delphes' tree)," << endl;
-    cout << " input_file_electron  - input file in ROOT format ('Delphes' tree)," << endl;
+    cout << " Usage: " << appName << " input_file_electron input_file_muon input_file_photon input_file_jet input_file_bjet input_file_taujet output_file version" << endl;
+    cout << " input_file_pion - input file in ROOT format ('Delphes' tree)," << endl;
+    cout << " input_file_electron - input file in ROOT format ('Delphes' tree)," << endl;
     cout << " input_file_muon - input file in ROOT format ('Delphes' tree)," << endl;
     cout << " input_file_photon - input file in ROOT format ('Delphes' tree)," << endl;
@@ -3050 +3051 @@
     cout << " input_file_cjet - input file in ROOT format ('Delphes' tree)," << endl;
     cout << " input_file_taujet - input file in ROOT format ('Delphes' tree)," << endl;
-    cout << " output_file - output file in ROOT format" << endl;
-    cout << " delphes version" << endl;
+    cout << " output_file - output file in ROOT format," << endl;
+    cout << " version - Delphes version" << endl;
 
     return 1;
@@ -3062 +3063 @@
   TApplication app(appName, &appargc, appargv);
 
-  Validation(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
+  DelphesValidation(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
 }
 

validation/validation.sh

@@ -97 +97 @@
 echo all particle guns complete ...
 
-./Validation $outputrootdir/particleGun_pion_$cardlabel.root $outputrootdir/particleGun_electron_$cardlabel.root $outputrootdir/particleGun_muon_$cardlabel.root $outputrootdir/particleGun_photon_$cardlabel.root $outputrootdir/particleGun_neutron_$cardlabel.root $outputrootdir/particleGun_jet_$cardlabel.root $outputrootdir/particleGun_bjet_$cardlabel.root $outputrootdir/particleGun_cjet_$cardlabel.root $outputrootdir/particleGun_taujet_$cardlabel.root $mainoutputdir/$output $version
+./DelphesValidation $outputrootdir/particleGun_pion_$cardlabel.root $outputrootdir/particleGun_electron_$cardlabel.root $outputrootdir/particleGun_muon_$cardlabel.root $outputrootdir/particleGun_photon_$cardlabel.root $outputrootdir/particleGun_neutron_$cardlabel.root $outputrootdir/particleGun_jet_$cardlabel.root $outputrootdir/particleGun_bjet_$cardlabel.root $outputrootdir/particleGun_cjet_$cardlabel.root $outputrootdir/particleGun_taujet_$cardlabel.root $mainoutputdir/$output $version