Procházet zdrojové kódy

Improvements for running jobs via condor

Caleb před 6 roky
rodič
revize
1b0e1bce9b

+ 20 - 5
looper/analysis/config.yaml

@@ -21,20 +21,35 @@ extra-wide-window:
 old-seeding:
     files: ../data/EGamma_18-03-08_trackingNtuple_old-seeding/180308_171441/0000/trackingNtuple_*.root
 
+eg-extra-narrow-window-t3:
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/ZToEE_NNPDF30_13TeV-powheg_M_120_200/EGamma_18-03-07_trackingNtuple_extra-narrow/180307_215057/0000/trackingNtuple_*.root
+
+eg-narrow-window-t3:
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/ZToEE_NNPDF30_13TeV-powheg_M_120_200/EGamma_18-03-07_trackingNtuple_narrow/180307_215909/0000/trackingNtuple_*.root
+
+eg-wide-window-t3:
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/ZToEE_NNPDF30_13TeV-powheg_M_120_200/EGamma_18-03-07_trackingNtuple_wide/180307_220112/0000/trackingNtuple_*.root
+
+eg-extra-wide-window-t3:
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/ZToEE_NNPDF30_13TeV-powheg_M_120_200/EGamma_18-03-07_trackingNtuple_extra-wide/180307_220241/0000/trackingNtuple_*.root
+
+eg-old-seeding-t3:
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/ZToEE_NNPDF30_13TeV-powheg_M_120_200/EGamma_18-03-08_trackingNtuple_old-seeding/180308_171441/0000/trackingNtuple_*.root
+
 ttbar-old-seeding-t3:
-    files: /home/dominguez/cfangmeier/store/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_old-seeding-ttbar/180322_190640/0000/trackingNtuple_*.root
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_old-seeding-ttbar/180322_190640/0000/trackingNtuple_*.root
 
 ttbar-extra-narrow-window-t3:
-    files: /home/dominguez/cfangmeier/store/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_extra-narrow-ttbar/180324_014232/0000/trackingNtuple_*.root
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_extra-narrow-ttbar/180324_014232/0000/trackingNtuple_*.root
 
 ttbar-narrow-window-t3:
-    files: /home/dominguez/cfangmeier/store/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_narrow-ttbar/180324_014406/0000/trackingNtuple_*.root
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_narrow-ttbar/180324_014406/0000/trackingNtuple_*.root
 
 ttbar-wide-window-t3:
-    files: /home/dominguez/cfangmeier/store/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_wide-ttbar/180322_191158/0000/trackingNtuple_*.root
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_wide-ttbar/180322_191158/0000/trackingNtuple_*.root
 
 ttbar-extra-wide-window-t3:
-    files: /home/dominguez/cfangmeier/store/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_extra-wide-ttbar/180324_014050/0000/trackingNtuple_*.root
+    files: /mnt/hadoop/user/uscms01/pnfs/unl.edu/data4/cms/store/user/cfangmei/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/EGamma_18-03-22_trackingNtuple_extra-wide-ttbar/180324_014050/0000/trackingNtuple_*.root
 
 hist-params:
 

+ 11 - 6
looper/analysis/tracking_eff.cpp

@@ -81,16 +81,16 @@ double deltaR(const SimTrack& sim_track, const Track& gsf_track) {
                 pow(sim_track.phi() - gsf_track.phi(), 2.0));
 }
 
-void run(bool silent){
+void run(){
     using namespace std;
     using namespace fv;
     using namespace fv_root;
+    using namespace fv_util;
     auto file_list = the_config->get_source_files();
     string output_filename = the_config->get_output_filename();
     TrackingDataSet tds(output_filename, file_list, "trackingNtuple/tree");
     register_objects(tds);
 
-
     auto hoe_cut = the_config->get("hoe_cut").as<float>(999);
 
     bs = {
@@ -249,7 +249,7 @@ void run(bool silent){
 
     auto& n_seeds = *tds.register_container<ContainerTH1<size_t>>("n_seeds", THParams::lookup("n_seeds"));
 
-    while (tds.next(!silent)) {
+    while (tds.next()) {
 
         for (const auto& sim_track : sim_tracks) {
             if (!is_good_sim(sim_track)) continue;
@@ -470,15 +470,20 @@ void run(bool silent){
 int main(int argc, char * argv[]){
     using namespace fv_util;
     ArgParser args(argc, argv);
-    bool silent = args.cmd_option_exists("-s");
     if(args.cmd_option_exists("-c")) {
         init_config(args.get_cmd_option("-c"));
         args.update_config();
+        if (args.cmd_option_exists("-s")) {
+            the_config->update_key("silent", true);
+        }
+        if (args.cmd_option_exists("-b")) {
+            the_config->update_key("batch", true);
+        }
         init_log(LogPriority::kLogInfo);
 //        gSystem->Load("libfilval.so");
-        run(silent);
+        run();
     } else {
-        cout << "Usage: ./" << argv[0] << " (-s) -c config_file.yaml" << endl;
+        cout << "Usage: ./" << argv[0] << " (-s) (-b) -c config_file.yaml" << endl;
     }
     return 0;
 }

+ 1 - 1
looper/filval

@@ -1 +1 @@
-Subproject commit a227be04fcce25f0beb72116839bbf59af36a85e
+Subproject commit e91fbb1a90a77223dc0ef41b94daedce269673f9

+ 23 - 0
looper/run_all.condor

@@ -0,0 +1,23 @@
+####################
+# Tracking Efficiency Submission
+#
+####################
+
+executable = run_all.sh
+universe   = vanilla
+error      = condor_logs/err.$(Process)
+output     = condor_logs/out.$(Process)
+log        = condor_logs/foo.log
+
+queue arguments from (
+    eg-extra-narrow-window-t3
+    eg-narrow-window-t3
+    eg-wide-window-t3
+    eg-extra-wide-window-t3
+    eg-old-seeding-t3
+    ttbar-extra-narrow-window-t3
+    ttbar-narrow-window-t3
+    ttbar-wide-window-t3
+    ttbar-extra-wide-window-t3
+    ttbar-old-seeding-t3
+)

+ 23 - 0
looper/run_all.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+pwd
+ls -la
+
+config="analysis/config.yaml"
+release="build"
+cmshome="/home/dominguez/cfangmeier/EGamma/CMSSW_9_2_8/src/"
+
+job_dir="job_${1}"
+mkdir -p $job_dir
+
+source /cvmfs/cms.cern.ch/cmsset_default.sh
+cd $cmshome
+pwd
+# cmsenv
+eval `scramv1 runtime -sh`
+cd -
+
+cp ./$release/tracking_eff $job_dir
+cp ${config} ${job_dir}/config.yaml
+
+./${job_dir}/tracking_eff -b -c ${job_dir}/config.yaml source-file-key=${1}

+ 14 - 16
looper/tools/run_in_tmux.sh

@@ -1,24 +1,22 @@
 #!/usr/bin/env zsh
 
-config="analysis/config.yaml"
-release=cmake-build-release
-out_dir=../hists/
-
-mkdir -p $out_dir
-
+mkdir -p ../hists/
 tmux new-window -n  'Run' "htop"
 
 run () {
-    tmux split-window -h "./$release/tracking_eff -c $config \
-                              source-file-key=${1} \
-                              output-file=$out_dir/${1}.root"
-    sleep 1
+    tmux split-window "./tools/run_single.sh ${1} || sleep 10"
+    tmux select-layout even-vertical
+    sleep 5
 }
 
-run extra-narrow-window-t3
-run narrow-window-t3
-# run wide-window
-run extra-wide-window-t3
-# run old-seeding
+# run eg-extra-narrow-window-t3
+# run eg-narrow-window-t3
+# run eg-wide-window-t3
+# run eg-extra-wide-window-t3
+run eg-old-seeding-t3
 
-tmux select-layout even-vertical
+# run ttbar-extra-narrow-window-t3
+# run ttbar-narrow-window-t3
+# run ttbar-wide-window-t3
+# run ttbar-extra-wide-window-t3
+run ttbar-old-seeding-t3

+ 12 - 0
looper/tools/run_single.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env zsh
+
+config="analysis/config.yaml"
+release="build"
+cmshome="/home/dominguez/cfangmeier/EGamma/CMSSW_9_2_8/src/"
+
+source /cvmfs/cms.cern.ch/cmsset_default.sh
+cd $cmshome
+cmsenv
+cd -
+./$release/tracking_eff -c $config source-file-key=${1}
+sleep 5