Fork me on GitHub

Changeset 181c061 in git


Ignore:
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

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • Makefile

    r88c03bc r181c061  
    151151        external/ExRootAnalysis/ExRootResult.h \
    152152        external/ExRootAnalysis/ExRootUtilities.h
    153 Validation$(ExeSuf): \
    154         tmp/validation/Validation.$(ObjSuf)
    155 
    156 tmp/validation/Validation.$(ObjSuf): \
    157         validation/Validation.cpp \
     153DelphesValidation$(ExeSuf): \
     154        tmp/validation/DelphesValidation.$(ObjSuf)
     155
     156tmp/validation/DelphesValidation.$(ObjSuf): \
     157        validation/DelphesValidation.cpp \
    158158        classes/DelphesClasses.h \
    159159        external/ExRootAnalysis/ExRootTreeReader.h \
    … …  
    171171        CaloGrid$(ExeSuf) \
    172172        Example1$(ExeSuf) \
    173         Validation$(ExeSuf)
     173        DelphesValidation$(ExeSuf)
    174174
    175175EXECUTABLE_OBJ +=  \
    … …  
    182182        tmp/examples/CaloGrid.$(ObjSuf) \
    183183        tmp/examples/Example1.$(ObjSuf) \
    184         tmp/validation/Validation.$(ObjSuf)
     184        tmp/validation/DelphesValidation.$(ObjSuf)
    185185
    186186DelphesHepMC$(ExeSuf): \

  • validation/DelphesValidation.cpp

    r88c03bc r181c061  
    14511451
    14521452
    1453 void Validation(const char *inputFilePion,
    1454                 const char *inputFileElectron,
    1455                 const char *inputFileMuon,
    1456                 const char *inputFilePhoton,
    1457                 const char *inputFileNeutralHadron,
    1458                 const char *inputFileJet,
    1459                 const char *inputFileBJet,
    1460                 const char *inputFileCJet,
    1461                 const char *inputFileTauJet,
    1462                 const char *outputFile,
    1463                 const char *version)
     1453void DelphesValidation(
     1454  const char *inputFilePion,
     1455  const char *inputFileElectron,
     1456  const char *inputFileMuon,
     1457  const char *inputFilePhoton,
     1458  const char *inputFileNeutralHadron,
     1459  const char *inputFileJet,
     1460  const char *inputFileBJet,
     1461  const char *inputFileCJet,
     1462  const char *inputFileTauJet,
     1463  const char *outputFile,
     1464  const char *version)
    14641465{
    14651466
    … …  
    30363037int main(int argc, char *argv[])
    30373038{
    3038   char *appName = "Validation";
     3039  char *appName = "DelphesValidation";
    30393040
    30403041  if(argc != 12)
    30413042  {
    3042     cout << " Usage: " << appName << " input_file_electron input_file_muon input_file_photon input_file_jet input_file_bjet input_file_taujet output_file" << endl;
    3043     cout << " input_file_pion  - input file in ROOT format ('Delphes' tree)," << endl;
    3044     cout << " input_file_electron  - input file in ROOT format ('Delphes' tree)," << endl;
     3043    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;
     3044    cout << " input_file_pion - input file in ROOT format ('Delphes' tree)," << endl;
     3045    cout << " input_file_electron - input file in ROOT format ('Delphes' tree)," << endl;
    30453046    cout << " input_file_muon - input file in ROOT format ('Delphes' tree)," << endl;
    30463047    cout << " input_file_photon - input file in ROOT format ('Delphes' tree)," << endl;
    … …  
    30503051    cout << " input_file_cjet - input file in ROOT format ('Delphes' tree)," << endl;
    30513052    cout << " input_file_taujet - input file in ROOT format ('Delphes' tree)," << endl;
    3052     cout << " output_file - output file in ROOT format" << endl;
    3053     cout << " delphes version" << endl;
     3053    cout << " output_file - output file in ROOT format," << endl;
     3054    cout << " version - Delphes version" << endl;
    30543055
    30553056    return 1;
    … …  
    30623063  TApplication app(appName, &appargc, appargv);
    30633064
    3064   Validation(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
     3065  DelphesValidation(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
    30653066}
    30663067

  • validation/validation.sh

    r88c03bc r181c061  
    9797echo all particle guns complete ...
    9898
    99 ./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
     99./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
    100100
    101101
Note: See TracChangeset for help on using the changeset viewer.