Fixes to compile on older gcc

looper/CMakeLists.txt

@@ -12,5 +12,6 @@ FIND_PACKAGE(ROOT REQUIRED)
 
 # Compiles tracking efficiency executable
 ADD_EXECUTABLE(tracking_eff analysis/tracking_eff.cpp)
-TARGET_LINK_LIBRARIES(tracking_eff filval yaml-cpp ${ROOT_LIBRARIES})
-TARGET_INCLUDE_DIRECTORIES(tracking_eff PUBLIC ${ROOT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR} filval/include/ filval/root/include/ filval/yaml-cpp/include/)
+# TARGET_LINK_LIBRARIES(tracking_eff filval yaml-cpp ${ROOT_LIBRARIES})
+TARGET_LINK_LIBRARIES(tracking_eff yaml-cpp ${ROOT_LIBRARIES})
+TARGET_INCLUDE_DIRECTORIES(tracking_eff PUBLIC ${ROOT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR} filval/include/ filval/root/include/ filval/yaml-cpp/include/)

looper/analysis/config.yaml

@@ -1,8 +1,8 @@
 #max-events: 50000
 debug: false
 
-output-file: ../hists/old-seeding.root
-source-file-key: old-seeding
+output-file: ../hists/ttbar-old-seeding.root
+source-file-key: ttbar-old-seeding-t3
 
 hoe_cut: 0.15
 
@@ -21,6 +21,21 @@ extra-wide-window:
 old-seeding:
     files: ../data/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
+
+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
+
+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
+
+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
+
+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
+
 hist-params:
 
     dRz_v_Et:

looper/analysis/tracking_eff.cpp

@@ -134,23 +134,23 @@ void run(bool silent){
             for (int layer=1; layer<=4; layer++) {
                 hist_params = (hit == 1) ? THParams::lookup("dRz_v_Et") : THParams::lookup("dRz_v_Et_outer_hits");
                 set_name("dRz", "BPIX", layer, hit, tm_type);
-                BPIX_residuals_dRz[{layer, hit, tm_type}] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
+                BPIX_residuals_dRz[make_tuple(layer, hit, tm_type)] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
                 set_name("dRz", "FPIX", layer, hit, tm_type);
-                FPIX_residuals_dRz[{layer, hit, tm_type}] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
+                FPIX_residuals_dRz[make_tuple(layer, hit, tm_type)] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
 
                 hist_params = (hit == 1) ? THParams::lookup("dPhi_v_Et") : THParams::lookup("dPhi_v_Et_outer_hits");
                 set_name("dPhi", "BPIX", layer, hit, tm_type);
-                BPIX_residuals_dPhi[{layer, hit, tm_type}] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
+                BPIX_residuals_dPhi[make_tuple(layer, hit, tm_type)] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
                 set_name("dPhi", "FPIX", layer, hit, tm_type);
-                FPIX_residuals_dPhi[{layer, hit, tm_type}] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
+                FPIX_residuals_dPhi[make_tuple(layer, hit, tm_type)] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
             }
             hist_params = (hit == 1) ? THParams::lookup("dRz_v_Et") : THParams::lookup("dRz_v_Et_outer_hits");
             set_name("dRz", "ALL", 0, hit, tm_type);
-            residuals_dRz[{hit, tm_type}] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
+            residuals_dRz[std::make_tuple(hit, tm_type)] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
 
             hist_params = (hit == 1) ? THParams::lookup("dPhi_v_Et") : THParams::lookup("dPhi_v_Et_outer_hits");
             set_name("dPhi", "ALL", 0, hit, tm_type);
-            residuals_dPhi[{hit, tm_type}] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
+            residuals_dPhi[make_tuple(hit, tm_type)] = tds.register_container<ContainerTH2<float>>(name.str(), hist_params);
         }
     }
 
@@ -422,12 +422,12 @@ void run(bool silent){
                         dRz_residuals_v_eta[hit_idx + 1]->fill(dRz, abs(seed.eta()));
                         dPhi_residuals_v_eta[hit_idx + 1]->fill(dPhi, abs(seed.eta()));
 
-                        dRz_residuals_v_region[{hit_idx + 1, eta_region}]->fill(dRz, seed.Et());
-                        dPhi_residuals_v_region[{hit_idx + 1, eta_region}]->fill(dPhi, seed.Et());
+                        dRz_residuals_v_region[make_pair(hit_idx + 1, eta_region)]->fill(dRz, seed.Et());
+                        dPhi_residuals_v_region[make_pair(hit_idx + 1, eta_region)]->fill(dPhi, seed.Et());
                     }
 
-                    residuals_dRz[{hit_idx + 1, tm_type}]->fill(dRz, seed.Et());
-                    residuals_dPhi[{hit_idx + 1, tm_type}]->fill(dPhi, seed.Et());
+                    residuals_dRz[make_tuple(hit_idx + 1, tm_type)]->fill(dRz, seed.Et());
+                    residuals_dPhi[make_tuple(hit_idx + 1, tm_type)]->fill(dPhi, seed.Et());
                     if (layerOrDiskNr == -1) continue;  // subDet is not set w/ old seeding
 
                     if (isBarrel)
@@ -436,11 +436,11 @@ void run(bool silent){
                         hit_vs_layer_forward.fill(layerOrDiskNr, static_cast<const int &>(hit_idx + 1));
 
                     if (isBarrel) {
-                        BPIX_residuals_dRz[{layerOrDiskNr, hit_idx + 1, tm_type}]->fill(dRz, seed.Et());
-                        BPIX_residuals_dPhi[{layerOrDiskNr, hit_idx + 1, tm_type}]->fill(dPhi, seed.Et());
+                        BPIX_residuals_dRz[make_tuple(layerOrDiskNr, hit_idx + 1, tm_type)]->fill(dRz, seed.Et());
+                        BPIX_residuals_dPhi[make_tuple(layerOrDiskNr, hit_idx + 1, tm_type)]->fill(dPhi, seed.Et());
                     } else {
-                        FPIX_residuals_dRz[{layerOrDiskNr, hit_idx + 1, tm_type}]->fill(dRz, seed.Et());
-                        FPIX_residuals_dPhi[{layerOrDiskNr, hit_idx + 1, tm_type}]->fill(dPhi, seed.Et());
+                        FPIX_residuals_dRz[make_tuple(layerOrDiskNr, hit_idx + 1, tm_type)]->fill(dRz, seed.Et());
+                        FPIX_residuals_dPhi[make_tuple(layerOrDiskNr, hit_idx + 1, tm_type)]->fill(dPhi, seed.Et());
                     }
                 }
             }

looper/filval

@@ -1 +1 @@
-Subproject commit 7b00cbe8bccc850cd5bab242fdff223fd41c6f36
+Subproject commit 9f1f43a93c2cfd7df9ec914723266ed626fe2d3b

looper/tools/run_in_tmux.sh

@@ -15,10 +15,10 @@ run () {
     sleep 1
 }
 
-run extra-narrow-window
-run narrow-window
-run wide-window
-run extra-wide-window
-run old-seeding
+run extra-narrow-window-t3
+run narrow-window-t3
+# run wide-window
+run extra-wide-window-t3
+# run old-seeding
 
 tmux select-layout even-vertical