diff --git a/Makefile b/Makefile index 83ea90284..3d775393b 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ EXTRACFLAGS = $(shell rooutil-config) -g EXTRAFLAGS = -fPIC -ITMultiDrawTreePlayer -Wunused-variable -lTMVA -lEG -lGenVector -lXMLIO -lMLP -lTreePlayer -L${CUDA_HOME}/lib64 -lcudart -fopenmp DOQUINTUPLET = #-DFP16_Base PTCUTFLAG = -T3T3EXTENSION= CUTVALUEFLAG = CUTVALUEFLAG_FLAGS = -DCUT_VALUE_DEBUG @@ -46,13 +45,13 @@ cutvalue_primitive: $(ROOUTIL) efficiency $(EXES) bin/doAnalysis: bin/doAnalysis.o $(OBJECTS) - $(CXX) $(PTCUTFLAG) $(T3T3EXTENSION) $(LDFLAGS) $^ $(ROOTLIBS) $(EXTRACFLAGS) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(EXTRAFLAGS) $(DOQUINTUPLET) $(ALPAKAINCLUDE) $(ALPAKASERIAL) -o $@ + $(CXX) $(PTCUTFLAG) $(LDFLAGS) $^ $(ROOTLIBS) $(EXTRACFLAGS) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(EXTRAFLAGS) $(DOQUINTUPLET) $(ALPAKAINCLUDE) $(ALPAKASERIAL) -o $@ bin/sdl: bin/sdl.o $(OBJECTS) - $(CXX) $(PTCUTFLAG) $(T3T3EXTENSION) $(LDFLAGS) $^ $(ROOTLIBS) $(EXTRACFLAGS) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(EXTRAFLAGS) $(DOQUINTUPLET) $(ALPAKAINCLUDE) $(ALPAKASERIAL) -o $@ + $(CXX) $(PTCUTFLAG) $(LDFLAGS) $^ $(ROOTLIBS) $(EXTRACFLAGS) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(EXTRAFLAGS) $(DOQUINTUPLET) $(ALPAKAINCLUDE) $(ALPAKASERIAL) -o $@ %.o: %.cc - $(CXX) $(PTCUTFLAG) $(T3T3EXTENSION) $(CFLAGS) $(EXTRACFLAGS) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(DOQUINTUPLET) $(ALPAKAINCLUDE) $(ALPAKASERIAL) $< -c -o $@ + $(CXX) $(PTCUTFLAG) $(CFLAGS) $(EXTRACFLAGS) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(DOQUINTUPLET) $(ALPAKAINCLUDE) $(ALPAKASERIAL) $< -c -o $@ $(ROOUTIL): $(MAKE) -C code/rooutil/ diff --git a/SDL/Event.h b/SDL/Event.h index f71d18031..e2f48b3c9 100644 --- a/SDL/Event.h +++ b/SDL/Event.h @@ -159,9 +159,6 @@ namespace SDL { int getNumberOfPixelTriplets(); int getNumberOfPixelQuintuplets(); - unsigned int getNumberOfExtendedTracks(); - unsigned int getNumberOfT3T3ExtendedTracks(); - objectRangesBuffer* getRanges(); hitsBuffer* getHits(); hitsBuffer* getHitsInCMSSW(); diff --git a/SDL/Makefile b/SDL/Makefile index efd74232f..51c7e1759 100644 --- a/SDL/Makefile +++ b/SDL/Makefile @@ -61,10 +61,10 @@ LST_cuda.o: LST.cc $(CXX) -c $(CXXFLAGS_CPU) $(ROOTLIBS) $(PRINTFLAG) $(CACHEFLAG) $(DUPLICATES) $(LSTWARNINGSFLAG) $(ROOTCFLAGS) $(ALPAKAINCLUDE) $(PTCUTFLAG) $(ALPAKASERIAL) $< -o $@ %_cpu.o: %.cc - $(COMPILE_CMD_CPU) $(CXXFLAGS_CPU) $(PRINTFLAG) $(CACHEFLAG) $(CUTVALUEFLAG) $(LSTWARNINGSFLAG) $(T5CUTFLAGS) $(NOPLSDUPCLEANFLAG) $(PTCUTFLAG) $(DUPLICATES) $(ALPAKAINCLUDE) $(ALPAKABACKEND_CPU) $< -o $@ + $(COMPILE_CMD_CPU) $(CXXFLAGS_CPU) $(PRINTFLAG) $(CACHEFLAG) $(CUTVALUEFLAG) $(LSTWARNINGSFLAG) $(T5CUTFLAGS) $(NOPLSDUPCLEANFLAG) $(TCPLSTRIPLETSFLAG) $(PTCUTFLAG) $(DUPLICATES) $(ALPAKAINCLUDE) $(ALPAKABACKEND_CPU) $< -o $@ %_cuda.o: %.cc - $(COMPILE_CMD_CUDA) $(CXXFLAGS_CUDA) $(PRINTFLAG) $(CACHEFLAG) $(CUTVALUEFLAG) $(LSTWARNINGSFLAG) $(T5CUTFLAGS) $(NOPLSDUPCLEANFLAG) $(PTCUTFLAG) $(DUPLICATES) $(ALPAKAINCLUDE) $(ALPAKABACKEND_CUDA) $< -o $@ + $(COMPILE_CMD_CUDA) $(CXXFLAGS_CUDA) $(PRINTFLAG) $(CACHEFLAG) $(CUTVALUEFLAG) $(LSTWARNINGSFLAG) $(T5CUTFLAGS) $(NOPLSDUPCLEANFLAG) $(TCPLSTRIPLETSFLAG) $(PTCUTFLAG) $(DUPLICATES) $(ALPAKAINCLUDE) $(ALPAKABACKEND_CUDA) $< -o $@ $(LIB_CUDA): $(CCOBJECTS_CUDA) $(LSTOBJECTS_CUDA) $(LD_CUDA) $(SOFLAGS_CUDA) $^ -o $@ diff --git a/SDL/TrackCandidate.h b/SDL/TrackCandidate.h index a0dbfc573..1a9dacc9c 100644 --- a/SDL/TrackCandidate.h +++ b/SDL/TrackCandidate.h @@ -516,7 +516,11 @@ namespace SDL { unsigned int nPixels = segmentsInGPU.nSegments[nLowerModules]; for (int pixelArrayIndex = globalThreadIdx[2]; pixelArrayIndex < nPixels; pixelArrayIndex += gridThreadExtent[2]) { +#ifdef TC_PLS_TRIPLETS + if (segmentsInGPU.isDup[pixelArrayIndex]) +#else if ((!segmentsInGPU.isQuad[pixelArrayIndex]) || (segmentsInGPU.isDup[pixelArrayIndex])) +#endif continue; unsigned int trackCandidateIdx = diff --git a/bin/sdl_make_tracklooper b/bin/sdl_make_tracklooper index ede85a397..97362e505 100755 --- a/bin/sdl_make_tracklooper +++ b/bin/sdl_make_tracklooper @@ -24,7 +24,7 @@ usage() echo " -m make clean binaries (Make clean binaries before remake. e.g. when header files changed in SDL/*.h)" echo " -d cut value ntuple (With extra variables in a debug ntuple file)" echo " -p primitive object ntuple (With extra variables related to primitive objects)" - echo " -3 do T3T3 extensions (-e turned on if not specified)" + echo " -3 TC pLS triplets (Allow triplet pLSs in TC collection)" echo " -N neural networks (Toggle LST neural networks)" echo " -G GPU (CUDA) backend (Compile only for CUDA, takes priority over -C)" echo " -C CPU serial backend (Compile only for CPU)" @@ -43,7 +43,7 @@ while getopts ":cxgsmdp3NGC2ehwP:" OPTION; do m) MAKECLEANBINARIES=true;; d) MAKECUTVALUES=true;; p) PRIMITIVE=true;; - 3) T3T3EXTENSION=true;; + 3) TCPLSTRIPLETS=true;; N) DONTUSENN=true;; G) ONLYCUDABACKEND=true;; C) ONLYCPUBACKEND=true;; @@ -61,7 +61,7 @@ if [ -z ${SHOWLOG} ]; then SHOWLOG=false; fi if [ -z ${MAKECLEANBINARIES} ]; then MAKECLEANBINARIES=false; fi if [ -z ${MAKECUTVALUES} ]; then MAKECUTVALUES=false; fi if [ -z ${PRIMITIVE} ]; then PRIMITIVE=false; fi -if [ -z ${T3T3EXTENSION} ]; then T3T3EXTENSION=false; fi +if [ -z ${TCPLSTRIPLETS} ]; then TCPLSTRIPLETS=false; fi if [ -z ${DONTUSENN} ]; then DONTUSENN=false; fi if [ -z ${ONLYCUDABACKEND} ]; then ONLYCUDABACKEND=false; fi if [ -z ${ONLYCPUBACKEND} ]; then ONLYCPUBACKEND=false; fi @@ -97,7 +97,7 @@ echo " SHOWLOG : ${SHOWLOG}" | tee -a ${LOG} echo " MAKECLEANBINARIES : ${MAKECLEANBINARIES}" | tee -a ${LOG} echo " MAKECUTVALUES : ${MAKECUTVALUES}" | tee -a ${LOG} echo " PRIMITIVE : ${PRIMITIVE}" | tee -a ${LOG} -echo " T3T3EXTENSION : ${T3T3EXTENSION}" | tee -a ${LOG} +echo " TCPLSTRIPLETS : ${TCPLSTRIPLETS}" | tee -a ${LOG} echo " DONTUSENN : ${DONTUSENN}" | tee -a ${LOG} echo " ONLYCUDABACKEND : ${ONLYCUDABACKEND}" | tee -a ${LOG} echo " ONLYCPUBACKEND : ${ONLYCPUBACKEND}" | tee -a ${LOG} @@ -138,9 +138,9 @@ if $PRIMITIVE; then echo "debug : MAKETARGET=${MAKETARGET}" fi -T3T3EXTENSIONOPT= -if $T3T3EXTENSION; then - T3T3EXTENSIONOPT="T3T3EXTENSION=-DT3T3_EXTENSIONS" +TCPLSTRIPLETSOPT= +if $TCPLSTRIPLETS; then + TCPLSTRIPLETSOPT="TCPLSTRIPLETSFLAG=-DTC_PLS_TRIPLETS" fi T5CUTOPT= @@ -181,9 +181,9 @@ echo "-------------------------------------------------------------------------- echo "---------------------------------------------------------------------------------------------" >> ${LOG} 2>&1 echo "---------------------------------------------------------------------------------------------" >> ${LOG} 2>&1 if $SHOWLOG; then - (cd SDL && make clean && make ${T3T3EXTENSIONOPT} ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${NOPLSDUPCLEANOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) 2>&1 | tee -a ${LOG} + (cd SDL && make clean && make ${TCPLSTRIPLETSOPT} ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${NOPLSDUPCLEANOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) 2>&1 | tee -a ${LOG} else - (cd SDL && make clean && make ${T3T3EXTENSIONOPT} ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${NOPLSDUPCLEANOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) >> ${LOG} 2>&1 + (cd SDL && make clean && make ${TCPLSTRIPLETSOPT} ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${NOPLSDUPCLEANOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) >> ${LOG} 2>&1 fi if ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cpu"* ]]) && [ ! -f SDL/libsdl_cpu.so ]; then @@ -215,9 +215,9 @@ echo "-------------------------------------------------------------------------- echo "---------------------------------------------------------------------------------------------" >> ${LOG} 2>&1 echo "---------------------------------------------------------------------------------------------" >> ${LOG} 2>&1 if $SHOWLOG; then - make ${T3T3EXTENSIONOPT} ${TRACKLOOPERTARGET} ${PTCUTOPT} -j 2>&1 | tee -a ${LOG} + make ${TRACKLOOPERTARGET} ${PTCUTOPT} -j 2>&1 | tee -a ${LOG} else - make ${T3T3EXTENSIONOPT} ${TRACKLOOPERTARGET} ${PTCUTOPT} -j >> ${LOG} 2>&1 + make ${TRACKLOOPERTARGET} ${PTCUTOPT} -j >> ${LOG} 2>&1 fi if [ ! -f bin/sdl ]; then diff --git a/efficiency/Makefile b/efficiency/Makefile index 72deb25b7..9986ca420 100644 --- a/efficiency/Makefile +++ b/efficiency/Makefile @@ -27,7 +27,7 @@ $(EXE): src/performance.o src/helper_v2.o src/SDL.o $(LD) $(CXXFLAGS) $(LDFLAGS) src/performance.o src/helper_v2.o src/SDL.o $(ROOTLIBS) $(EXTRAFLAGS) -o $@ src/SDL.o: src/SDL.cc src/SDL.h - $(CC) $(T3T3EXTENSION) $(CFLAGS) $(EXTRACFLAGS) $< -c -o $@ + $(CC) $(CFLAGS) $(EXTRACFLAGS) $< -c -o $@ src/performance.o: src/performance.cc src/performance.h src/sdl_types.h $(CC) $(CFLAGS) $(EXTRACFLAGS) $< -c -o $@ diff --git a/efficiency/python/SDL.cc b/efficiency/python/SDL.cc index 10662f79e..1415102f3 100644 --- a/efficiency/python/SDL.cc +++ b/efficiency/python/SDL.cc @@ -43,21 +43,11 @@ void SDL::Init(TTree *tree) { sim_eta_branch = tree->GetBranch("sim_eta"); if (sim_eta_branch) { sim_eta_branch->SetAddress(&sim_eta_); } } - T3T3_layer_binary_branch = 0; - if (tree->GetBranch("T3T3_layer_binary") != 0) { - T3T3_layer_binary_branch = tree->GetBranch("T3T3_layer_binary"); - if (T3T3_layer_binary_branch) { T3T3_layer_binary_branch->SetAddress(&T3T3_layer_binary_); } - } pT3_foundDuplicate_branch = 0; if (tree->GetBranch("pT3_foundDuplicate") != 0) { pT3_foundDuplicate_branch = tree->GetBranch("pT3_foundDuplicate"); if (pT3_foundDuplicate_branch) { pT3_foundDuplicate_branch->SetAddress(&pT3_foundDuplicate_); } } - sim_T3T3_matched_branch = 0; - if (tree->GetBranch("sim_T3T3_matched") != 0) { - sim_T3T3_matched_branch = tree->GetBranch("sim_T3T3_matched"); - if (sim_T3T3_matched_branch) { sim_T3T3_matched_branch->SetAddress(&sim_T3T3_matched_); } - } sim_len_branch = 0; if (tree->GetBranch("sim_len") != 0) { sim_len_branch = tree->GetBranch("sim_len"); @@ -83,11 +73,6 @@ void SDL::Init(TTree *tree) { sim_denom_branch = tree->GetBranch("sim_denom"); if (sim_denom_branch) { sim_denom_branch->SetAddress(&sim_denom_); } } - T3T3_anchorIndex_branch = 0; - if (tree->GetBranch("T3T3_anchorIndex") != 0) { - T3T3_anchorIndex_branch = tree->GetBranch("T3T3_anchorIndex"); - if (T3T3_anchorIndex_branch) { T3T3_anchorIndex_branch->SetAddress(&T3T3_anchorIndex_); } - } pT5_isDuplicate_branch = 0; if (tree->GetBranch("pT5_isDuplicate") != 0) { pT5_isDuplicate_branch = tree->GetBranch("pT5_isDuplicate"); @@ -123,11 +108,6 @@ void SDL::Init(TTree *tree) { pureTCE_rzChiSquared_branch = tree->GetBranch("pureTCE_rzChiSquared"); if (pureTCE_rzChiSquared_branch) { pureTCE_rzChiSquared_branch->SetAddress(&pureTCE_rzChiSquared_); } } - T3T3_regressionRadius_branch = 0; - if (tree->GetBranch("T3T3_regressionRadius") != 0) { - T3T3_regressionRadius_branch = tree->GetBranch("T3T3_regressionRadius"); - if (T3T3_regressionRadius_branch) { T3T3_regressionRadius_branch->SetAddress(&T3T3_regressionRadius_); } - } t4_isDuplicate_branch = 0; if (tree->GetBranch("t4_isDuplicate") != 0) { t4_isDuplicate_branch = tree->GetBranch("t4_isDuplicate"); @@ -163,26 +143,6 @@ void SDL::Init(TTree *tree) { t5_eta_2_branch = tree->GetBranch("t5_eta_2"); if (t5_eta_2_branch) { t5_eta_2_branch->SetAddress(&t5_eta_2_); } } - T3T3_pt_branch = 0; - if (tree->GetBranch("T3T3_pt") != 0) { - T3T3_pt_branch = tree->GetBranch("T3T3_pt"); - if (T3T3_pt_branch) { T3T3_pt_branch->SetAddress(&T3T3_pt_); } - } - T3T3_maxHitMatchedCounts_branch = 0; - if (tree->GetBranch("T3T3_maxHitMatchedCounts") != 0) { - T3T3_maxHitMatchedCounts_branch = tree->GetBranch("T3T3_maxHitMatchedCounts"); - if (T3T3_maxHitMatchedCounts_branch) { T3T3_maxHitMatchedCounts_branch->SetAddress(&T3T3_maxHitMatchedCounts_); } - } - T3T3_anchorType_branch = 0; - if (tree->GetBranch("T3T3_anchorType") != 0) { - T3T3_anchorType_branch = tree->GetBranch("T3T3_anchorType"); - if (T3T3_anchorType_branch) { T3T3_anchorType_branch->SetAddress(&T3T3_anchorType_); } - } - T3T3_nLayerOverlaps_branch = 0; - if (tree->GetBranch("T3T3_nLayerOverlaps") != 0) { - T3T3_nLayerOverlaps_branch = tree->GetBranch("T3T3_nLayerOverlaps"); - if (T3T3_nLayerOverlaps_branch) { T3T3_nLayerOverlaps_branch->SetAddress(&T3T3_nLayerOverlaps_); } - } pLS_eta_branch = 0; if (tree->GetBranch("pLS_eta") != 0) { pLS_eta_branch = tree->GetBranch("pLS_eta"); @@ -203,11 +163,6 @@ void SDL::Init(TTree *tree) { tce_layer_binary_branch = tree->GetBranch("tce_layer_binary"); if (tce_layer_binary_branch) { tce_layer_binary_branch->SetAddress(&tce_layer_binary_); } } - sim_T3T3_types_branch = 0; - if (tree->GetBranch("sim_T3T3_types") != 0) { - sim_T3T3_types_branch = tree->GetBranch("sim_T3T3_types"); - if (sim_T3T3_types_branch) { sim_T3T3_types_branch->SetAddress(&sim_T3T3_types_); } - } sim_TC_matched_nonextended_branch = 0; if (tree->GetBranch("sim_TC_matched_nonextended") != 0) { sim_TC_matched_nonextended_branch = tree->GetBranch("sim_TC_matched_nonextended"); @@ -223,11 +178,6 @@ void SDL::Init(TTree *tree) { tce_eta_branch = tree->GetBranch("tce_eta"); if (tce_eta_branch) { tce_eta_branch->SetAddress(&tce_eta_); } } - T3T3_rzChiSquared_branch = 0; - if (tree->GetBranch("T3T3_rzChiSquared") != 0) { - T3T3_rzChiSquared_branch = tree->GetBranch("T3T3_rzChiSquared"); - if (T3T3_rzChiSquared_branch) { T3T3_rzChiSquared_branch->SetAddress(&T3T3_rzChiSquared_); } - } tce_isDuplicate_branch = 0; if (tree->GetBranch("tce_isDuplicate") != 0) { tce_isDuplicate_branch = tree->GetBranch("tce_isDuplicate"); @@ -373,11 +323,6 @@ void SDL::Init(TTree *tree) { sim_pca_dxy_branch = tree->GetBranch("sim_pca_dxy"); if (sim_pca_dxy_branch) { sim_pca_dxy_branch->SetAddress(&sim_pca_dxy_); } } - T3T3_isDuplicate_branch = 0; - if (tree->GetBranch("T3T3_isDuplicate") != 0) { - T3T3_isDuplicate_branch = tree->GetBranch("T3T3_isDuplicate"); - if (T3T3_isDuplicate_branch) { T3T3_isDuplicate_branch->SetAddress(&T3T3_isDuplicate_); } - } pT4_phi_branch = 0; if (tree->GetBranch("pT4_phi") != 0) { pT4_phi_branch = tree->GetBranch("pT4_phi"); @@ -398,21 +343,11 @@ void SDL::Init(TTree *tree) { sim_pureTCE_matched_branch = tree->GetBranch("sim_pureTCE_matched"); if (sim_pureTCE_matched_branch) { sim_pureTCE_matched_branch->SetAddress(&sim_pureTCE_matched_); } } - T3T3_eta_branch = 0; - if (tree->GetBranch("T3T3_eta") != 0) { - T3T3_eta_branch = tree->GetBranch("T3T3_eta"); - if (T3T3_eta_branch) { T3T3_eta_branch->SetAddress(&T3T3_eta_); } - } t3_occupancies_branch = 0; if (tree->GetBranch("t3_occupancies") != 0) { t3_occupancies_branch = tree->GetBranch("t3_occupancies"); if (t3_occupancies_branch) { t3_occupancies_branch->SetAddress(&t3_occupancies_); } } - T3T3_matched_simIdx_branch = 0; - if (tree->GetBranch("T3T3_matched_simIdx") != 0) { - T3T3_matched_simIdx_branch = tree->GetBranch("T3T3_matched_simIdx"); - if (T3T3_matched_simIdx_branch) { T3T3_matched_simIdx_branch->SetAddress(&T3T3_matched_simIdx_); } - } t5_foundDuplicate_branch = 0; if (tree->GetBranch("t5_foundDuplicate") != 0) { t5_foundDuplicate_branch = tree->GetBranch("t5_foundDuplicate"); @@ -423,11 +358,6 @@ void SDL::Init(TTree *tree) { sim_pT4_types_branch = tree->GetBranch("sim_pT4_types"); if (sim_pT4_types_branch) { sim_pT4_types_branch->SetAddress(&sim_pT4_types_); } } - T3T3_matched_pt_branch = 0; - if (tree->GetBranch("T3T3_matched_pt") != 0) { - T3T3_matched_pt_branch = tree->GetBranch("T3T3_matched_pt"); - if (T3T3_matched_pt_branch) { T3T3_matched_pt_branch->SetAddress(&T3T3_matched_pt_); } - } t4_isFake_branch = 0; if (tree->GetBranch("t4_isFake") != 0) { t4_isFake_branch = tree->GetBranch("t4_isFake"); @@ -478,11 +408,6 @@ void SDL::Init(TTree *tree) { pT5_pt_branch = tree->GetBranch("pT5_pt"); if (pT5_pt_branch) { pT5_pt_branch->SetAddress(&pT5_pt_); } } - T3T3_isFake_branch = 0; - if (tree->GetBranch("T3T3_isFake") != 0) { - T3T3_isFake_branch = tree->GetBranch("T3T3_isFake"); - if (T3T3_isFake_branch) { T3T3_isFake_branch->SetAddress(&T3T3_isFake_); } - } pureTCE_rPhiChiSquared_branch = 0; if (tree->GetBranch("pureTCE_rPhiChiSquared") != 0) { pureTCE_rPhiChiSquared_branch = tree->GetBranch("pureTCE_rPhiChiSquared"); @@ -508,11 +433,6 @@ void SDL::Init(TTree *tree) { tc_maxHitMatchedCounts_branch = tree->GetBranch("tc_maxHitMatchedCounts"); if (tc_maxHitMatchedCounts_branch) { tc_maxHitMatchedCounts_branch->SetAddress(&tc_maxHitMatchedCounts_); } } - T3T3_phi_branch = 0; - if (tree->GetBranch("T3T3_phi") != 0) { - T3T3_phi_branch = tree->GetBranch("T3T3_phi"); - if (T3T3_phi_branch) { T3T3_phi_branch->SetAddress(&T3T3_phi_); } - } pureTCE_nLayerOverlaps_branch = 0; if (tree->GetBranch("pureTCE_nLayerOverlaps") != 0) { pureTCE_nLayerOverlaps_branch = tree->GetBranch("pureTCE_nLayerOverlaps"); @@ -558,11 +478,6 @@ void SDL::Init(TTree *tree) { pT5_eta_branch = tree->GetBranch("pT5_eta"); if (pT5_eta_branch) { pT5_eta_branch->SetAddress(&pT5_eta_); } } - T3T3_innerT3Radius_branch = 0; - if (tree->GetBranch("T3T3_innerT3Radius") != 0) { - T3T3_innerT3Radius_branch = tree->GetBranch("T3T3_innerT3Radius"); - if (T3T3_innerT3Radius_branch) { T3T3_innerT3Radius_branch->SetAddress(&T3T3_innerT3Radius_); } - } tc_phi_branch = 0; if (tree->GetBranch("tc_phi") != 0) { tc_phi_branch = tree->GetBranch("tc_phi"); @@ -613,11 +528,6 @@ void SDL::Init(TTree *tree) { sim_pT4_matched_branch = tree->GetBranch("sim_pT4_matched"); if (sim_pT4_matched_branch) { sim_pT4_matched_branch->SetAddress(&sim_pT4_matched_); } } - T3T3_rPhiChiSquared_branch = 0; - if (tree->GetBranch("T3T3_rPhiChiSquared") != 0) { - T3T3_rPhiChiSquared_branch = tree->GetBranch("T3T3_rPhiChiSquared"); - if (T3T3_rPhiChiSquared_branch) { T3T3_rPhiChiSquared_branch->SetAddress(&T3T3_rPhiChiSquared_); } - } tc_eta_branch = 0; if (tree->GetBranch("tc_eta") != 0) { tc_eta_branch = tree->GetBranch("tc_eta"); @@ -688,11 +598,6 @@ void SDL::Init(TTree *tree) { t5_occupancies_branch = tree->GetBranch("t5_occupancies"); if (t5_occupancies_branch) { t5_occupancies_branch->SetAddress(&t5_occupancies_); } } - T3T3_outerT3Radius_branch = 0; - if (tree->GetBranch("T3T3_outerT3Radius") != 0) { - T3T3_outerT3Radius_branch = tree->GetBranch("T3T3_outerT3Radius"); - if (T3T3_outerT3Radius_branch) { T3T3_outerT3Radius_branch->SetAddress(&T3T3_outerT3Radius_); } - } tc_type_branch = 0; if (tree->GetBranch("tc_type") != 0) { tc_type_branch = tree->GetBranch("tc_type"); @@ -728,11 +633,6 @@ void SDL::Init(TTree *tree) { t4_pt_branch = tree->GetBranch("t4_pt"); if (t4_pt_branch) { t4_pt_branch->SetAddress(&t4_pt_); } } - T3T3_nHitOverlaps_branch = 0; - if (tree->GetBranch("T3T3_nHitOverlaps") != 0) { - T3T3_nHitOverlaps_branch = tree->GetBranch("T3T3_nHitOverlaps"); - if (T3T3_nHitOverlaps_branch) { T3T3_nHitOverlaps_branch->SetAddress(&T3T3_nHitOverlaps_); } - } sim_TC_types_branch = 0; if (tree->GetBranch("sim_TC_types") != 0) { sim_TC_types_branch = tree->GetBranch("sim_TC_types"); @@ -835,15 +735,12 @@ void SDL::GetEntry(unsigned int idx) { sim_event_isLoaded = false; sim_q_isLoaded = false; sim_eta_isLoaded = false; - T3T3_layer_binary_isLoaded = false; pT3_foundDuplicate_isLoaded = false; - sim_T3T3_matched_isLoaded = false; sim_len_isLoaded = false; pureTCE_isDuplicate_isLoaded = false; pT3_score_isLoaded = false; t5_eta_isLoaded = false; sim_denom_isLoaded = false; - T3T3_anchorIndex_isLoaded = false; pT5_isDuplicate_isLoaded = false; sim_tce_matched_isLoaded = false; pT3_isDuplicate_isLoaded = false; @@ -851,7 +748,6 @@ void SDL::GetEntry(unsigned int idx) { pT3_eta_2_isLoaded = false; sim_pT3_matched_isLoaded = false; pureTCE_rzChiSquared_isLoaded = false; - T3T3_regressionRadius_isLoaded = false; t4_isDuplicate_isLoaded = false; pureTCE_eta_isLoaded = false; tce_rPhiChiSquared_isLoaded = false; @@ -859,19 +755,13 @@ void SDL::GetEntry(unsigned int idx) { pureTCE_pt_isLoaded = false; sim_pt_isLoaded = false; t5_eta_2_isLoaded = false; - T3T3_pt_isLoaded = false; - T3T3_maxHitMatchedCounts_isLoaded = false; - T3T3_anchorType_isLoaded = false; - T3T3_nLayerOverlaps_isLoaded = false; pLS_eta_isLoaded = false; sim_pdgId_isLoaded = false; t3_eta_isLoaded = false; tce_layer_binary_isLoaded = false; - sim_T3T3_types_isLoaded = false; sim_TC_matched_nonextended_isLoaded = false; t4_occupancies_isLoaded = false; tce_eta_isLoaded = false; - T3T3_rzChiSquared_isLoaded = false; tce_isDuplicate_isLoaded = false; pT5_matched_simIdx_isLoaded = false; sim_tcIdx_isLoaded = false; @@ -901,17 +791,13 @@ void SDL::GetEntry(unsigned int idx) { tc_sim_isLoaded = false; sim_pLS_types_isLoaded = false; sim_pca_dxy_isLoaded = false; - T3T3_isDuplicate_isLoaded = false; pT4_phi_isLoaded = false; sim_hits_isLoaded = false; pLS_phi_isLoaded = false; sim_pureTCE_matched_isLoaded = false; - T3T3_eta_isLoaded = false; t3_occupancies_isLoaded = false; - T3T3_matched_simIdx_isLoaded = false; t5_foundDuplicate_isLoaded = false; sim_pT4_types_isLoaded = false; - T3T3_matched_pt_isLoaded = false; t4_isFake_isLoaded = false; simvtx_x_isLoaded = false; simvtx_y_isLoaded = false; @@ -922,13 +808,11 @@ void SDL::GetEntry(unsigned int idx) { tc_pt_isLoaded = false; pT3_phi_2_isLoaded = false; pT5_pt_isLoaded = false; - T3T3_isFake_isLoaded = false; pureTCE_rPhiChiSquared_isLoaded = false; pT5_score_isLoaded = false; sim_phi_isLoaded = false; pT5_isFake_isLoaded = false; tc_maxHitMatchedCounts_isLoaded = false; - T3T3_phi_isLoaded = false; pureTCE_nLayerOverlaps_isLoaded = false; sim_pca_dz_isLoaded = false; pureTCE_nHitOverlaps_isLoaded = false; @@ -938,7 +822,6 @@ void SDL::GetEntry(unsigned int idx) { pLS_score_isLoaded = false; pT3_phi_isLoaded = false; pT5_eta_isLoaded = false; - T3T3_innerT3Radius_isLoaded = false; tc_phi_isLoaded = false; t4_eta_isLoaded = false; pLS_isFake_isLoaded = false; @@ -949,7 +832,6 @@ void SDL::GetEntry(unsigned int idx) { sim_parentVtxIdx_isLoaded = false; pureTCE_layer_binary_isLoaded = false; sim_pT4_matched_isLoaded = false; - T3T3_rPhiChiSquared_isLoaded = false; tc_eta_isLoaded = false; sim_lengap_isLoaded = false; sim_T5_matched_isLoaded = false; @@ -964,7 +846,6 @@ void SDL::GetEntry(unsigned int idx) { pLS_isDuplicate_isLoaded = false; tce_anchorIndex_isLoaded = false; t5_occupancies_isLoaded = false; - T3T3_outerT3Radius_isLoaded = false; tc_type_isLoaded = false; tce_isFake_isLoaded = false; pLS_pt_isLoaded = false; @@ -972,7 +853,6 @@ void SDL::GetEntry(unsigned int idx) { sim_T4_types_isLoaded = false; pT4_isDuplicate_isLoaded = false; t4_pt_isLoaded = false; - T3T3_nHitOverlaps_isLoaded = false; sim_TC_types_isLoaded = false; sg_occupancies_isLoaded = false; pT4_pt_isLoaded = false; @@ -1001,15 +881,12 @@ void SDL::LoadAllBranches() { if (sim_event_branch != 0) sim_event(); if (sim_q_branch != 0) sim_q(); if (sim_eta_branch != 0) sim_eta(); - if (T3T3_layer_binary_branch != 0) T3T3_layer_binary(); if (pT3_foundDuplicate_branch != 0) pT3_foundDuplicate(); - if (sim_T3T3_matched_branch != 0) sim_T3T3_matched(); if (sim_len_branch != 0) sim_len(); if (pureTCE_isDuplicate_branch != 0) pureTCE_isDuplicate(); if (pT3_score_branch != 0) pT3_score(); if (t5_eta_branch != 0) t5_eta(); if (sim_denom_branch != 0) sim_denom(); - if (T3T3_anchorIndex_branch != 0) T3T3_anchorIndex(); if (pT5_isDuplicate_branch != 0) pT5_isDuplicate(); if (sim_tce_matched_branch != 0) sim_tce_matched(); if (pT3_isDuplicate_branch != 0) pT3_isDuplicate(); @@ -1017,7 +894,6 @@ void SDL::LoadAllBranches() { if (pT3_eta_2_branch != 0) pT3_eta_2(); if (sim_pT3_matched_branch != 0) sim_pT3_matched(); if (pureTCE_rzChiSquared_branch != 0) pureTCE_rzChiSquared(); - if (T3T3_regressionRadius_branch != 0) T3T3_regressionRadius(); if (t4_isDuplicate_branch != 0) t4_isDuplicate(); if (pureTCE_eta_branch != 0) pureTCE_eta(); if (tce_rPhiChiSquared_branch != 0) tce_rPhiChiSquared(); @@ -1025,19 +901,13 @@ void SDL::LoadAllBranches() { if (pureTCE_pt_branch != 0) pureTCE_pt(); if (sim_pt_branch != 0) sim_pt(); if (t5_eta_2_branch != 0) t5_eta_2(); - if (T3T3_pt_branch != 0) T3T3_pt(); - if (T3T3_maxHitMatchedCounts_branch != 0) T3T3_maxHitMatchedCounts(); - if (T3T3_anchorType_branch != 0) T3T3_anchorType(); - if (T3T3_nLayerOverlaps_branch != 0) T3T3_nLayerOverlaps(); if (pLS_eta_branch != 0) pLS_eta(); if (sim_pdgId_branch != 0) sim_pdgId(); if (t3_eta_branch != 0) t3_eta(); if (tce_layer_binary_branch != 0) tce_layer_binary(); - if (sim_T3T3_types_branch != 0) sim_T3T3_types(); if (sim_TC_matched_nonextended_branch != 0) sim_TC_matched_nonextended(); if (t4_occupancies_branch != 0) t4_occupancies(); if (tce_eta_branch != 0) tce_eta(); - if (T3T3_rzChiSquared_branch != 0) T3T3_rzChiSquared(); if (tce_isDuplicate_branch != 0) tce_isDuplicate(); if (pT5_matched_simIdx_branch != 0) pT5_matched_simIdx(); if (sim_tcIdx_branch != 0) sim_tcIdx(); @@ -1067,17 +937,13 @@ void SDL::LoadAllBranches() { if (tc_sim_branch != 0) tc_sim(); if (sim_pLS_types_branch != 0) sim_pLS_types(); if (sim_pca_dxy_branch != 0) sim_pca_dxy(); - if (T3T3_isDuplicate_branch != 0) T3T3_isDuplicate(); if (pT4_phi_branch != 0) pT4_phi(); if (sim_hits_branch != 0) sim_hits(); if (pLS_phi_branch != 0) pLS_phi(); if (sim_pureTCE_matched_branch != 0) sim_pureTCE_matched(); - if (T3T3_eta_branch != 0) T3T3_eta(); if (t3_occupancies_branch != 0) t3_occupancies(); - if (T3T3_matched_simIdx_branch != 0) T3T3_matched_simIdx(); if (t5_foundDuplicate_branch != 0) t5_foundDuplicate(); if (sim_pT4_types_branch != 0) sim_pT4_types(); - if (T3T3_matched_pt_branch != 0) T3T3_matched_pt(); if (t4_isFake_branch != 0) t4_isFake(); if (simvtx_x_branch != 0) simvtx_x(); if (simvtx_y_branch != 0) simvtx_y(); @@ -1088,13 +954,11 @@ void SDL::LoadAllBranches() { if (tc_pt_branch != 0) tc_pt(); if (pT3_phi_2_branch != 0) pT3_phi_2(); if (pT5_pt_branch != 0) pT5_pt(); - if (T3T3_isFake_branch != 0) T3T3_isFake(); if (pureTCE_rPhiChiSquared_branch != 0) pureTCE_rPhiChiSquared(); if (pT5_score_branch != 0) pT5_score(); if (sim_phi_branch != 0) sim_phi(); if (pT5_isFake_branch != 0) pT5_isFake(); if (tc_maxHitMatchedCounts_branch != 0) tc_maxHitMatchedCounts(); - if (T3T3_phi_branch != 0) T3T3_phi(); if (pureTCE_nLayerOverlaps_branch != 0) pureTCE_nLayerOverlaps(); if (sim_pca_dz_branch != 0) sim_pca_dz(); if (pureTCE_nHitOverlaps_branch != 0) pureTCE_nHitOverlaps(); @@ -1104,7 +968,6 @@ void SDL::LoadAllBranches() { if (pLS_score_branch != 0) pLS_score(); if (pT3_phi_branch != 0) pT3_phi(); if (pT5_eta_branch != 0) pT5_eta(); - if (T3T3_innerT3Radius_branch != 0) T3T3_innerT3Radius(); if (tc_phi_branch != 0) tc_phi(); if (t4_eta_branch != 0) t4_eta(); if (pLS_isFake_branch != 0) pLS_isFake(); @@ -1115,7 +978,6 @@ void SDL::LoadAllBranches() { if (sim_parentVtxIdx_branch != 0) sim_parentVtxIdx(); if (pureTCE_layer_binary_branch != 0) pureTCE_layer_binary(); if (sim_pT4_matched_branch != 0) sim_pT4_matched(); - if (T3T3_rPhiChiSquared_branch != 0) T3T3_rPhiChiSquared(); if (tc_eta_branch != 0) tc_eta(); if (sim_lengap_branch != 0) sim_lengap(); if (sim_T5_matched_branch != 0) sim_T5_matched(); @@ -1130,7 +992,6 @@ void SDL::LoadAllBranches() { if (pLS_isDuplicate_branch != 0) pLS_isDuplicate(); if (tce_anchorIndex_branch != 0) tce_anchorIndex(); if (t5_occupancies_branch != 0) t5_occupancies(); - if (T3T3_outerT3Radius_branch != 0) T3T3_outerT3Radius(); if (tc_type_branch != 0) tc_type(); if (tce_isFake_branch != 0) tce_isFake(); if (pLS_pt_branch != 0) pLS_pt(); @@ -1138,7 +999,6 @@ void SDL::LoadAllBranches() { if (sim_T4_types_branch != 0) sim_T4_types(); if (pT4_isDuplicate_branch != 0) pT4_isDuplicate(); if (t4_pt_branch != 0) t4_pt(); - if (T3T3_nHitOverlaps_branch != 0) T3T3_nHitOverlaps(); if (sim_TC_types_branch != 0) sim_TC_types(); if (sg_occupancies_branch != 0) sg_occupancies(); if (pT4_pt_branch != 0) pT4_pt(); @@ -1254,18 +1114,6 @@ const vector &SDL::sim_eta() { } return *sim_eta_; } -const vector &SDL::T3T3_layer_binary() { - if (not T3T3_layer_binary_isLoaded) { - if (T3T3_layer_binary_branch != 0) { - T3T3_layer_binary_branch->GetEntry(index); - } else { - printf("branch T3T3_layer_binary_branch does not exist!\n"); - exit(1); - } - T3T3_layer_binary_isLoaded = true; - } - return *T3T3_layer_binary_; -} const vector &SDL::pT3_foundDuplicate() { if (not pT3_foundDuplicate_isLoaded) { if (pT3_foundDuplicate_branch != 0) { @@ -1278,18 +1126,6 @@ const vector &SDL::pT3_foundDuplicate() { } return *pT3_foundDuplicate_; } -const vector &SDL::sim_T3T3_matched() { - if (not sim_T3T3_matched_isLoaded) { - if (sim_T3T3_matched_branch != 0) { - sim_T3T3_matched_branch->GetEntry(index); - } else { - printf("branch sim_T3T3_matched_branch does not exist!\n"); - exit(1); - } - sim_T3T3_matched_isLoaded = true; - } - return *sim_T3T3_matched_; -} const vector &SDL::sim_len() { if (not sim_len_isLoaded) { if (sim_len_branch != 0) { @@ -1350,18 +1186,6 @@ const vector &SDL::sim_denom() { } return *sim_denom_; } -const vector &SDL::T3T3_anchorIndex() { - if (not T3T3_anchorIndex_isLoaded) { - if (T3T3_anchorIndex_branch != 0) { - T3T3_anchorIndex_branch->GetEntry(index); - } else { - printf("branch T3T3_anchorIndex_branch does not exist!\n"); - exit(1); - } - T3T3_anchorIndex_isLoaded = true; - } - return *T3T3_anchorIndex_; -} const vector &SDL::pT5_isDuplicate() { if (not pT5_isDuplicate_isLoaded) { if (pT5_isDuplicate_branch != 0) { @@ -1446,18 +1270,6 @@ const vector &SDL::pureTCE_rzChiSquared() { } return *pureTCE_rzChiSquared_; } -const vector &SDL::T3T3_regressionRadius() { - if (not T3T3_regressionRadius_isLoaded) { - if (T3T3_regressionRadius_branch != 0) { - T3T3_regressionRadius_branch->GetEntry(index); - } else { - printf("branch T3T3_regressionRadius_branch does not exist!\n"); - exit(1); - } - T3T3_regressionRadius_isLoaded = true; - } - return *T3T3_regressionRadius_; -} const vector &SDL::t4_isDuplicate() { if (not t4_isDuplicate_isLoaded) { if (t4_isDuplicate_branch != 0) { @@ -1542,54 +1354,6 @@ const vector &SDL::t5_eta_2() { } return *t5_eta_2_; } -const vector &SDL::T3T3_pt() { - if (not T3T3_pt_isLoaded) { - if (T3T3_pt_branch != 0) { - T3T3_pt_branch->GetEntry(index); - } else { - printf("branch T3T3_pt_branch does not exist!\n"); - exit(1); - } - T3T3_pt_isLoaded = true; - } - return *T3T3_pt_; -} -const vector &SDL::T3T3_maxHitMatchedCounts() { - if (not T3T3_maxHitMatchedCounts_isLoaded) { - if (T3T3_maxHitMatchedCounts_branch != 0) { - T3T3_maxHitMatchedCounts_branch->GetEntry(index); - } else { - printf("branch T3T3_maxHitMatchedCounts_branch does not exist!\n"); - exit(1); - } - T3T3_maxHitMatchedCounts_isLoaded = true; - } - return *T3T3_maxHitMatchedCounts_; -} -const vector &SDL::T3T3_anchorType() { - if (not T3T3_anchorType_isLoaded) { - if (T3T3_anchorType_branch != 0) { - T3T3_anchorType_branch->GetEntry(index); - } else { - printf("branch T3T3_anchorType_branch does not exist!\n"); - exit(1); - } - T3T3_anchorType_isLoaded = true; - } - return *T3T3_anchorType_; -} -const vector > &SDL::T3T3_nLayerOverlaps() { - if (not T3T3_nLayerOverlaps_isLoaded) { - if (T3T3_nLayerOverlaps_branch != 0) { - T3T3_nLayerOverlaps_branch->GetEntry(index); - } else { - printf("branch T3T3_nLayerOverlaps_branch does not exist!\n"); - exit(1); - } - T3T3_nLayerOverlaps_isLoaded = true; - } - return *T3T3_nLayerOverlaps_; -} const vector &SDL::pLS_eta() { if (not pLS_eta_isLoaded) { if (pLS_eta_branch != 0) { @@ -1638,18 +1402,6 @@ const vector &SDL::tce_layer_binary() { } return *tce_layer_binary_; } -const vector > &SDL::sim_T3T3_types() { - if (not sim_T3T3_types_isLoaded) { - if (sim_T3T3_types_branch != 0) { - sim_T3T3_types_branch->GetEntry(index); - } else { - printf("branch sim_T3T3_types_branch does not exist!\n"); - exit(1); - } - sim_T3T3_types_isLoaded = true; - } - return *sim_T3T3_types_; -} const vector &SDL::sim_TC_matched_nonextended() { if (not sim_TC_matched_nonextended_isLoaded) { if (sim_TC_matched_nonextended_branch != 0) { @@ -1686,18 +1438,6 @@ const vector &SDL::tce_eta() { } return *tce_eta_; } -const vector &SDL::T3T3_rzChiSquared() { - if (not T3T3_rzChiSquared_isLoaded) { - if (T3T3_rzChiSquared_branch != 0) { - T3T3_rzChiSquared_branch->GetEntry(index); - } else { - printf("branch T3T3_rzChiSquared_branch does not exist!\n"); - exit(1); - } - T3T3_rzChiSquared_isLoaded = true; - } - return *T3T3_rzChiSquared_; -} const vector &SDL::tce_isDuplicate() { if (not tce_isDuplicate_isLoaded) { if (tce_isDuplicate_branch != 0) { @@ -2046,18 +1786,6 @@ const vector &SDL::sim_pca_dxy() { } return *sim_pca_dxy_; } -const vector &SDL::T3T3_isDuplicate() { - if (not T3T3_isDuplicate_isLoaded) { - if (T3T3_isDuplicate_branch != 0) { - T3T3_isDuplicate_branch->GetEntry(index); - } else { - printf("branch T3T3_isDuplicate_branch does not exist!\n"); - exit(1); - } - T3T3_isDuplicate_isLoaded = true; - } - return *T3T3_isDuplicate_; -} const vector &SDL::pT4_phi() { if (not pT4_phi_isLoaded) { if (pT4_phi_branch != 0) { @@ -2106,18 +1834,6 @@ const vector &SDL::sim_pureTCE_matched() { } return *sim_pureTCE_matched_; } -const vector &SDL::T3T3_eta() { - if (not T3T3_eta_isLoaded) { - if (T3T3_eta_branch != 0) { - T3T3_eta_branch->GetEntry(index); - } else { - printf("branch T3T3_eta_branch does not exist!\n"); - exit(1); - } - T3T3_eta_isLoaded = true; - } - return *T3T3_eta_; -} const vector &SDL::t3_occupancies() { if (not t3_occupancies_isLoaded) { if (t3_occupancies_branch != 0) { @@ -2130,18 +1846,6 @@ const vector &SDL::t3_occupancies() { } return *t3_occupancies_; } -const vector > &SDL::T3T3_matched_simIdx() { - if (not T3T3_matched_simIdx_isLoaded) { - if (T3T3_matched_simIdx_branch != 0) { - T3T3_matched_simIdx_branch->GetEntry(index); - } else { - printf("branch T3T3_matched_simIdx_branch does not exist!\n"); - exit(1); - } - T3T3_matched_simIdx_isLoaded = true; - } - return *T3T3_matched_simIdx_; -} const vector &SDL::t5_foundDuplicate() { if (not t5_foundDuplicate_isLoaded) { if (t5_foundDuplicate_branch != 0) { @@ -2166,18 +1870,6 @@ const vector > &SDL::sim_pT4_types() { } return *sim_pT4_types_; } -const vector &SDL::T3T3_matched_pt() { - if (not T3T3_matched_pt_isLoaded) { - if (T3T3_matched_pt_branch != 0) { - T3T3_matched_pt_branch->GetEntry(index); - } else { - printf("branch T3T3_matched_pt_branch does not exist!\n"); - exit(1); - } - T3T3_matched_pt_isLoaded = true; - } - return *T3T3_matched_pt_; -} const vector &SDL::t4_isFake() { if (not t4_isFake_isLoaded) { if (t4_isFake_branch != 0) { @@ -2298,18 +1990,6 @@ const vector &SDL::pT5_pt() { } return *pT5_pt_; } -const vector &SDL::T3T3_isFake() { - if (not T3T3_isFake_isLoaded) { - if (T3T3_isFake_branch != 0) { - T3T3_isFake_branch->GetEntry(index); - } else { - printf("branch T3T3_isFake_branch does not exist!\n"); - exit(1); - } - T3T3_isFake_isLoaded = true; - } - return *T3T3_isFake_; -} const vector &SDL::pureTCE_rPhiChiSquared() { if (not pureTCE_rPhiChiSquared_isLoaded) { if (pureTCE_rPhiChiSquared_branch != 0) { @@ -2370,18 +2050,6 @@ const vector &SDL::tc_maxHitMatchedCounts() { } return *tc_maxHitMatchedCounts_; } -const vector &SDL::T3T3_phi() { - if (not T3T3_phi_isLoaded) { - if (T3T3_phi_branch != 0) { - T3T3_phi_branch->GetEntry(index); - } else { - printf("branch T3T3_phi_branch does not exist!\n"); - exit(1); - } - T3T3_phi_isLoaded = true; - } - return *T3T3_phi_; -} const vector > &SDL::pureTCE_nLayerOverlaps() { if (not pureTCE_nLayerOverlaps_isLoaded) { if (pureTCE_nLayerOverlaps_branch != 0) { @@ -2490,18 +2158,6 @@ const vector &SDL::pT5_eta() { } return *pT5_eta_; } -const vector &SDL::T3T3_innerT3Radius() { - if (not T3T3_innerT3Radius_isLoaded) { - if (T3T3_innerT3Radius_branch != 0) { - T3T3_innerT3Radius_branch->GetEntry(index); - } else { - printf("branch T3T3_innerT3Radius_branch does not exist!\n"); - exit(1); - } - T3T3_innerT3Radius_isLoaded = true; - } - return *T3T3_innerT3Radius_; -} const vector &SDL::tc_phi() { if (not tc_phi_isLoaded) { if (tc_phi_branch != 0) { @@ -2622,18 +2278,6 @@ const vector &SDL::sim_pT4_matched() { } return *sim_pT4_matched_; } -const vector &SDL::T3T3_rPhiChiSquared() { - if (not T3T3_rPhiChiSquared_isLoaded) { - if (T3T3_rPhiChiSquared_branch != 0) { - T3T3_rPhiChiSquared_branch->GetEntry(index); - } else { - printf("branch T3T3_rPhiChiSquared_branch does not exist!\n"); - exit(1); - } - T3T3_rPhiChiSquared_isLoaded = true; - } - return *T3T3_rPhiChiSquared_; -} const vector &SDL::tc_eta() { if (not tc_eta_isLoaded) { if (tc_eta_branch != 0) { @@ -2802,18 +2446,6 @@ const vector &SDL::t5_occupancies() { } return *t5_occupancies_; } -const vector &SDL::T3T3_outerT3Radius() { - if (not T3T3_outerT3Radius_isLoaded) { - if (T3T3_outerT3Radius_branch != 0) { - T3T3_outerT3Radius_branch->GetEntry(index); - } else { - printf("branch T3T3_outerT3Radius_branch does not exist!\n"); - exit(1); - } - T3T3_outerT3Radius_isLoaded = true; - } - return *T3T3_outerT3Radius_; -} const vector &SDL::tc_type() { if (not tc_type_isLoaded) { if (tc_type_branch != 0) { @@ -2898,18 +2530,6 @@ const vector &SDL::t4_pt() { } return *t4_pt_; } -const vector > &SDL::T3T3_nHitOverlaps() { - if (not T3T3_nHitOverlaps_isLoaded) { - if (T3T3_nHitOverlaps_branch != 0) { - T3T3_nHitOverlaps_branch->GetEntry(index); - } else { - printf("branch T3T3_nHitOverlaps_branch does not exist!\n"); - exit(1); - } - T3T3_nHitOverlaps_isLoaded = true; - } - return *T3T3_nHitOverlaps_; -} const vector > &SDL::sim_TC_types() { if (not sim_TC_types_isLoaded) { if (sim_TC_types_branch != 0) { @@ -3153,15 +2773,12 @@ namespace tas { const vector &sim_event() { return sdl.sim_event(); } const vector &sim_q() { return sdl.sim_q(); } const vector &sim_eta() { return sdl.sim_eta(); } - const vector &T3T3_layer_binary() { return sdl.T3T3_layer_binary(); } const vector &pT3_foundDuplicate() { return sdl.pT3_foundDuplicate(); } - const vector &sim_T3T3_matched() { return sdl.sim_T3T3_matched(); } const vector &sim_len() { return sdl.sim_len(); } const vector &pureTCE_isDuplicate() { return sdl.pureTCE_isDuplicate(); } const vector &pT3_score() { return sdl.pT3_score(); } const vector &t5_eta() { return sdl.t5_eta(); } const vector &sim_denom() { return sdl.sim_denom(); } - const vector &T3T3_anchorIndex() { return sdl.T3T3_anchorIndex(); } const vector &pT5_isDuplicate() { return sdl.pT5_isDuplicate(); } const vector &sim_tce_matched() { return sdl.sim_tce_matched(); } const vector &pT3_isDuplicate() { return sdl.pT3_isDuplicate(); } @@ -3169,7 +2786,6 @@ namespace tas { const vector &pT3_eta_2() { return sdl.pT3_eta_2(); } const vector &sim_pT3_matched() { return sdl.sim_pT3_matched(); } const vector &pureTCE_rzChiSquared() { return sdl.pureTCE_rzChiSquared(); } - const vector &T3T3_regressionRadius() { return sdl.T3T3_regressionRadius(); } const vector &t4_isDuplicate() { return sdl.t4_isDuplicate(); } const vector &pureTCE_eta() { return sdl.pureTCE_eta(); } const vector &tce_rPhiChiSquared() { return sdl.tce_rPhiChiSquared(); } @@ -3177,19 +2793,13 @@ namespace tas { const vector &pureTCE_pt() { return sdl.pureTCE_pt(); } const vector &sim_pt() { return sdl.sim_pt(); } const vector &t5_eta_2() { return sdl.t5_eta_2(); } - const vector &T3T3_pt() { return sdl.T3T3_pt(); } - const vector &T3T3_maxHitMatchedCounts() { return sdl.T3T3_maxHitMatchedCounts(); } - const vector &T3T3_anchorType() { return sdl.T3T3_anchorType(); } - const vector > &T3T3_nLayerOverlaps() { return sdl.T3T3_nLayerOverlaps(); } const vector &pLS_eta() { return sdl.pLS_eta(); } const vector &sim_pdgId() { return sdl.sim_pdgId(); } const vector &t3_eta() { return sdl.t3_eta(); } const vector &tce_layer_binary() { return sdl.tce_layer_binary(); } - const vector > &sim_T3T3_types() { return sdl.sim_T3T3_types(); } const vector &sim_TC_matched_nonextended() { return sdl.sim_TC_matched_nonextended(); } const vector &t4_occupancies() { return sdl.t4_occupancies(); } const vector &tce_eta() { return sdl.tce_eta(); } - const vector &T3T3_rzChiSquared() { return sdl.T3T3_rzChiSquared(); } const vector &tce_isDuplicate() { return sdl.tce_isDuplicate(); } const vector > &pT5_matched_simIdx() { return sdl.pT5_matched_simIdx(); } const vector > &sim_tcIdx() { return sdl.sim_tcIdx(); } @@ -3219,17 +2829,13 @@ namespace tas { const vector &tc_sim() { return sdl.tc_sim(); } const vector > &sim_pLS_types() { return sdl.sim_pLS_types(); } const vector &sim_pca_dxy() { return sdl.sim_pca_dxy(); } - const vector &T3T3_isDuplicate() { return sdl.T3T3_isDuplicate(); } const vector &pT4_phi() { return sdl.pT4_phi(); } const vector &sim_hits() { return sdl.sim_hits(); } const vector &pLS_phi() { return sdl.pLS_phi(); } const vector &sim_pureTCE_matched() { return sdl.sim_pureTCE_matched(); } - const vector &T3T3_eta() { return sdl.T3T3_eta(); } const vector &t3_occupancies() { return sdl.t3_occupancies(); } - const vector > &T3T3_matched_simIdx() { return sdl.T3T3_matched_simIdx(); } const vector &t5_foundDuplicate() { return sdl.t5_foundDuplicate(); } const vector > &sim_pT4_types() { return sdl.sim_pT4_types(); } - const vector &T3T3_matched_pt() { return sdl.T3T3_matched_pt(); } const vector &t4_isFake() { return sdl.t4_isFake(); } const vector &simvtx_x() { return sdl.simvtx_x(); } const vector &simvtx_y() { return sdl.simvtx_y(); } @@ -3240,13 +2846,11 @@ namespace tas { const vector &tc_pt() { return sdl.tc_pt(); } const vector &pT3_phi_2() { return sdl.pT3_phi_2(); } const vector &pT5_pt() { return sdl.pT5_pt(); } - const vector &T3T3_isFake() { return sdl.T3T3_isFake(); } const vector &pureTCE_rPhiChiSquared() { return sdl.pureTCE_rPhiChiSquared(); } const vector &pT5_score() { return sdl.pT5_score(); } const vector &sim_phi() { return sdl.sim_phi(); } const vector &pT5_isFake() { return sdl.pT5_isFake(); } const vector &tc_maxHitMatchedCounts() { return sdl.tc_maxHitMatchedCounts(); } - const vector &T3T3_phi() { return sdl.T3T3_phi(); } const vector > &pureTCE_nLayerOverlaps() { return sdl.pureTCE_nLayerOverlaps(); } const vector &sim_pca_dz() { return sdl.sim_pca_dz(); } const vector > &pureTCE_nHitOverlaps() { return sdl.pureTCE_nHitOverlaps(); } @@ -3256,7 +2860,6 @@ namespace tas { const vector &pLS_score() { return sdl.pLS_score(); } const vector &pT3_phi() { return sdl.pT3_phi(); } const vector &pT5_eta() { return sdl.pT5_eta(); } - const vector &T3T3_innerT3Radius() { return sdl.T3T3_innerT3Radius(); } const vector &tc_phi() { return sdl.tc_phi(); } const vector &t4_eta() { return sdl.t4_eta(); } const vector &pLS_isFake() { return sdl.pLS_isFake(); } @@ -3267,7 +2870,6 @@ namespace tas { const vector &sim_parentVtxIdx() { return sdl.sim_parentVtxIdx(); } const vector &pureTCE_layer_binary() { return sdl.pureTCE_layer_binary(); } const vector &sim_pT4_matched() { return sdl.sim_pT4_matched(); } - const vector &T3T3_rPhiChiSquared() { return sdl.T3T3_rPhiChiSquared(); } const vector &tc_eta() { return sdl.tc_eta(); } const vector &sim_lengap() { return sdl.sim_lengap(); } const vector &sim_T5_matched() { return sdl.sim_T5_matched(); } @@ -3282,7 +2884,6 @@ namespace tas { const vector &pLS_isDuplicate() { return sdl.pLS_isDuplicate(); } const vector &tce_anchorIndex() { return sdl.tce_anchorIndex(); } const vector &t5_occupancies() { return sdl.t5_occupancies(); } - const vector &T3T3_outerT3Radius() { return sdl.T3T3_outerT3Radius(); } const vector &tc_type() { return sdl.tc_type(); } const vector &tce_isFake() { return sdl.tce_isFake(); } const vector &pLS_pt() { return sdl.pLS_pt(); } @@ -3290,7 +2891,6 @@ namespace tas { const vector > &sim_T4_types() { return sdl.sim_T4_types(); } const vector &pT4_isDuplicate() { return sdl.pT4_isDuplicate(); } const vector &t4_pt() { return sdl.t4_pt(); } - const vector > &T3T3_nHitOverlaps() { return sdl.T3T3_nHitOverlaps(); } const vector > &sim_TC_types() { return sdl.sim_TC_types(); } const vector &sg_occupancies() { return sdl.sg_occupancies(); } const vector &pT4_pt() { return sdl.pT4_pt(); } diff --git a/efficiency/python/SDL.h b/efficiency/python/SDL.h index f0dc02630..7d3711eb7 100644 --- a/efficiency/python/SDL.h +++ b/efficiency/python/SDL.h @@ -44,15 +44,9 @@ class SDL { vector *sim_eta_; TBranch *sim_eta_branch; bool sim_eta_isLoaded; - vector *T3T3_layer_binary_; - TBranch *T3T3_layer_binary_branch; - bool T3T3_layer_binary_isLoaded; vector *pT3_foundDuplicate_; TBranch *pT3_foundDuplicate_branch; bool pT3_foundDuplicate_isLoaded; - vector *sim_T3T3_matched_; - TBranch *sim_T3T3_matched_branch; - bool sim_T3T3_matched_isLoaded; vector *sim_len_; TBranch *sim_len_branch; bool sim_len_isLoaded; @@ -68,9 +62,6 @@ class SDL { vector *sim_denom_; TBranch *sim_denom_branch; bool sim_denom_isLoaded; - vector *T3T3_anchorIndex_; - TBranch *T3T3_anchorIndex_branch; - bool T3T3_anchorIndex_isLoaded; vector *pT5_isDuplicate_; TBranch *pT5_isDuplicate_branch; bool pT5_isDuplicate_isLoaded; @@ -92,9 +83,6 @@ class SDL { vector *pureTCE_rzChiSquared_; TBranch *pureTCE_rzChiSquared_branch; bool pureTCE_rzChiSquared_isLoaded; - vector *T3T3_regressionRadius_; - TBranch *T3T3_regressionRadius_branch; - bool T3T3_regressionRadius_isLoaded; vector *t4_isDuplicate_; TBranch *t4_isDuplicate_branch; bool t4_isDuplicate_isLoaded; @@ -116,18 +104,6 @@ class SDL { vector *t5_eta_2_; TBranch *t5_eta_2_branch; bool t5_eta_2_isLoaded; - vector *T3T3_pt_; - TBranch *T3T3_pt_branch; - bool T3T3_pt_isLoaded; - vector *T3T3_maxHitMatchedCounts_; - TBranch *T3T3_maxHitMatchedCounts_branch; - bool T3T3_maxHitMatchedCounts_isLoaded; - vector *T3T3_anchorType_; - TBranch *T3T3_anchorType_branch; - bool T3T3_anchorType_isLoaded; - vector > *T3T3_nLayerOverlaps_; - TBranch *T3T3_nLayerOverlaps_branch; - bool T3T3_nLayerOverlaps_isLoaded; vector *pLS_eta_; TBranch *pLS_eta_branch; bool pLS_eta_isLoaded; @@ -140,9 +116,6 @@ class SDL { vector *tce_layer_binary_; TBranch *tce_layer_binary_branch; bool tce_layer_binary_isLoaded; - vector > *sim_T3T3_types_; - TBranch *sim_T3T3_types_branch; - bool sim_T3T3_types_isLoaded; vector *sim_TC_matched_nonextended_; TBranch *sim_TC_matched_nonextended_branch; bool sim_TC_matched_nonextended_isLoaded; @@ -152,9 +125,6 @@ class SDL { vector *tce_eta_; TBranch *tce_eta_branch; bool tce_eta_isLoaded; - vector *T3T3_rzChiSquared_; - TBranch *T3T3_rzChiSquared_branch; - bool T3T3_rzChiSquared_isLoaded; vector *tce_isDuplicate_; TBranch *tce_isDuplicate_branch; bool tce_isDuplicate_isLoaded; @@ -242,9 +212,6 @@ class SDL { vector *sim_pca_dxy_; TBranch *sim_pca_dxy_branch; bool sim_pca_dxy_isLoaded; - vector *T3T3_isDuplicate_; - TBranch *T3T3_isDuplicate_branch; - bool T3T3_isDuplicate_isLoaded; vector *pT4_phi_; TBranch *pT4_phi_branch; bool pT4_phi_isLoaded; @@ -257,24 +224,15 @@ class SDL { vector *sim_pureTCE_matched_; TBranch *sim_pureTCE_matched_branch; bool sim_pureTCE_matched_isLoaded; - vector *T3T3_eta_; - TBranch *T3T3_eta_branch; - bool T3T3_eta_isLoaded; vector *t3_occupancies_; TBranch *t3_occupancies_branch; bool t3_occupancies_isLoaded; - vector > *T3T3_matched_simIdx_; - TBranch *T3T3_matched_simIdx_branch; - bool T3T3_matched_simIdx_isLoaded; vector *t5_foundDuplicate_; TBranch *t5_foundDuplicate_branch; bool t5_foundDuplicate_isLoaded; vector > *sim_pT4_types_; TBranch *sim_pT4_types_branch; bool sim_pT4_types_isLoaded; - vector *T3T3_matched_pt_; - TBranch *T3T3_matched_pt_branch; - bool T3T3_matched_pt_isLoaded; vector *t4_isFake_; TBranch *t4_isFake_branch; bool t4_isFake_isLoaded; @@ -305,9 +263,6 @@ class SDL { vector *pT5_pt_; TBranch *pT5_pt_branch; bool pT5_pt_isLoaded; - vector *T3T3_isFake_; - TBranch *T3T3_isFake_branch; - bool T3T3_isFake_isLoaded; vector *pureTCE_rPhiChiSquared_; TBranch *pureTCE_rPhiChiSquared_branch; bool pureTCE_rPhiChiSquared_isLoaded; @@ -323,9 +278,6 @@ class SDL { vector *tc_maxHitMatchedCounts_; TBranch *tc_maxHitMatchedCounts_branch; bool tc_maxHitMatchedCounts_isLoaded; - vector *T3T3_phi_; - TBranch *T3T3_phi_branch; - bool T3T3_phi_isLoaded; vector > *pureTCE_nLayerOverlaps_; TBranch *pureTCE_nLayerOverlaps_branch; bool pureTCE_nLayerOverlaps_isLoaded; @@ -353,9 +305,6 @@ class SDL { vector *pT5_eta_; TBranch *pT5_eta_branch; bool pT5_eta_isLoaded; - vector *T3T3_innerT3Radius_; - TBranch *T3T3_innerT3Radius_branch; - bool T3T3_innerT3Radius_isLoaded; vector *tc_phi_; TBranch *tc_phi_branch; bool tc_phi_isLoaded; @@ -386,9 +335,6 @@ class SDL { vector *sim_pT4_matched_; TBranch *sim_pT4_matched_branch; bool sim_pT4_matched_isLoaded; - vector *T3T3_rPhiChiSquared_; - TBranch *T3T3_rPhiChiSquared_branch; - bool T3T3_rPhiChiSquared_isLoaded; vector *tc_eta_; TBranch *tc_eta_branch; bool tc_eta_isLoaded; @@ -431,9 +377,6 @@ class SDL { vector *t5_occupancies_; TBranch *t5_occupancies_branch; bool t5_occupancies_isLoaded; - vector *T3T3_outerT3Radius_; - TBranch *T3T3_outerT3Radius_branch; - bool T3T3_outerT3Radius_isLoaded; vector *tc_type_; TBranch *tc_type_branch; bool tc_type_isLoaded; @@ -455,9 +398,6 @@ class SDL { vector *t4_pt_; TBranch *t4_pt_branch; bool t4_pt_isLoaded; - vector > *T3T3_nHitOverlaps_; - TBranch *T3T3_nHitOverlaps_branch; - bool T3T3_nHitOverlaps_isLoaded; vector > *sim_TC_types_; TBranch *sim_TC_types_branch; bool sim_TC_types_isLoaded; @@ -524,15 +464,12 @@ class SDL { const vector &sim_event(); const vector &sim_q(); const vector &sim_eta(); - const vector &T3T3_layer_binary(); const vector &pT3_foundDuplicate(); - const vector &sim_T3T3_matched(); const vector &sim_len(); const vector &pureTCE_isDuplicate(); const vector &pT3_score(); const vector &t5_eta(); const vector &sim_denom(); - const vector &T3T3_anchorIndex(); const vector &pT5_isDuplicate(); const vector &sim_tce_matched(); const vector &pT3_isDuplicate(); @@ -540,7 +477,6 @@ class SDL { const vector &pT3_eta_2(); const vector &sim_pT3_matched(); const vector &pureTCE_rzChiSquared(); - const vector &T3T3_regressionRadius(); const vector &t4_isDuplicate(); const vector &pureTCE_eta(); const vector &tce_rPhiChiSquared(); @@ -548,19 +484,13 @@ class SDL { const vector &pureTCE_pt(); const vector &sim_pt(); const vector &t5_eta_2(); - const vector &T3T3_pt(); - const vector &T3T3_maxHitMatchedCounts(); - const vector &T3T3_anchorType(); - const vector > &T3T3_nLayerOverlaps(); const vector &pLS_eta(); const vector &sim_pdgId(); const vector &t3_eta(); const vector &tce_layer_binary(); - const vector > &sim_T3T3_types(); const vector &sim_TC_matched_nonextended(); const vector &t4_occupancies(); const vector &tce_eta(); - const vector &T3T3_rzChiSquared(); const vector &tce_isDuplicate(); const vector > &pT5_matched_simIdx(); const vector > &sim_tcIdx(); @@ -590,17 +520,13 @@ class SDL { const vector &tc_sim(); const vector > &sim_pLS_types(); const vector &sim_pca_dxy(); - const vector &T3T3_isDuplicate(); const vector &pT4_phi(); const vector &sim_hits(); const vector &pLS_phi(); const vector &sim_pureTCE_matched(); - const vector &T3T3_eta(); const vector &t3_occupancies(); - const vector > &T3T3_matched_simIdx(); const vector &t5_foundDuplicate(); const vector > &sim_pT4_types(); - const vector &T3T3_matched_pt(); const vector &t4_isFake(); const vector &simvtx_x(); const vector &simvtx_y(); @@ -611,13 +537,11 @@ class SDL { const vector &tc_pt(); const vector &pT3_phi_2(); const vector &pT5_pt(); - const vector &T3T3_isFake(); const vector &pureTCE_rPhiChiSquared(); const vector &pT5_score(); const vector &sim_phi(); const vector &pT5_isFake(); const vector &tc_maxHitMatchedCounts(); - const vector &T3T3_phi(); const vector > &pureTCE_nLayerOverlaps(); const vector &sim_pca_dz(); const vector > &pureTCE_nHitOverlaps(); @@ -627,7 +551,6 @@ class SDL { const vector &pLS_score(); const vector &pT3_phi(); const vector &pT5_eta(); - const vector &T3T3_innerT3Radius(); const vector &tc_phi(); const vector &t4_eta(); const vector &pLS_isFake(); @@ -638,7 +561,6 @@ class SDL { const vector &sim_parentVtxIdx(); const vector &pureTCE_layer_binary(); const vector &sim_pT4_matched(); - const vector &T3T3_rPhiChiSquared(); const vector &tc_eta(); const vector &sim_lengap(); const vector &sim_T5_matched(); @@ -653,7 +575,6 @@ class SDL { const vector &pLS_isDuplicate(); const vector &tce_anchorIndex(); const vector &t5_occupancies(); - const vector &T3T3_outerT3Radius(); const vector &tc_type(); const vector &tce_isFake(); const vector &pLS_pt(); @@ -661,7 +582,6 @@ class SDL { const vector > &sim_T4_types(); const vector &pT4_isDuplicate(); const vector &t4_pt(); - const vector > &T3T3_nHitOverlaps(); const vector > &sim_TC_types(); const vector &sg_occupancies(); const vector &pT4_pt(); @@ -697,15 +617,12 @@ namespace tas { const vector &sim_event(); const vector &sim_q(); const vector &sim_eta(); - const vector &T3T3_layer_binary(); const vector &pT3_foundDuplicate(); - const vector &sim_T3T3_matched(); const vector &sim_len(); const vector &pureTCE_isDuplicate(); const vector &pT3_score(); const vector &t5_eta(); const vector &sim_denom(); - const vector &T3T3_anchorIndex(); const vector &pT5_isDuplicate(); const vector &sim_tce_matched(); const vector &pT3_isDuplicate(); @@ -713,7 +630,6 @@ namespace tas { const vector &pT3_eta_2(); const vector &sim_pT3_matched(); const vector &pureTCE_rzChiSquared(); - const vector &T3T3_regressionRadius(); const vector &t4_isDuplicate(); const vector &pureTCE_eta(); const vector &tce_rPhiChiSquared(); @@ -721,19 +637,13 @@ namespace tas { const vector &pureTCE_pt(); const vector &sim_pt(); const vector &t5_eta_2(); - const vector &T3T3_pt(); - const vector &T3T3_maxHitMatchedCounts(); - const vector &T3T3_anchorType(); - const vector > &T3T3_nLayerOverlaps(); const vector &pLS_eta(); const vector &sim_pdgId(); const vector &t3_eta(); const vector &tce_layer_binary(); - const vector > &sim_T3T3_types(); const vector &sim_TC_matched_nonextended(); const vector &t4_occupancies(); const vector &tce_eta(); - const vector &T3T3_rzChiSquared(); const vector &tce_isDuplicate(); const vector > &pT5_matched_simIdx(); const vector > &sim_tcIdx(); @@ -763,17 +673,13 @@ namespace tas { const vector &tc_sim(); const vector > &sim_pLS_types(); const vector &sim_pca_dxy(); - const vector &T3T3_isDuplicate(); const vector &pT4_phi(); const vector &sim_hits(); const vector &pLS_phi(); const vector &sim_pureTCE_matched(); - const vector &T3T3_eta(); const vector &t3_occupancies(); - const vector > &T3T3_matched_simIdx(); const vector &t5_foundDuplicate(); const vector > &sim_pT4_types(); - const vector &T3T3_matched_pt(); const vector &t4_isFake(); const vector &simvtx_x(); const vector &simvtx_y(); @@ -784,13 +690,11 @@ namespace tas { const vector &tc_pt(); const vector &pT3_phi_2(); const vector &pT5_pt(); - const vector &T3T3_isFake(); const vector &pureTCE_rPhiChiSquared(); const vector &pT5_score(); const vector &sim_phi(); const vector &pT5_isFake(); const vector &tc_maxHitMatchedCounts(); - const vector &T3T3_phi(); const vector > &pureTCE_nLayerOverlaps(); const vector &sim_pca_dz(); const vector > &pureTCE_nHitOverlaps(); @@ -800,7 +704,6 @@ namespace tas { const vector &pLS_score(); const vector &pT3_phi(); const vector &pT5_eta(); - const vector &T3T3_innerT3Radius(); const vector &tc_phi(); const vector &t4_eta(); const vector &pLS_isFake(); @@ -811,7 +714,6 @@ namespace tas { const vector &sim_parentVtxIdx(); const vector &pureTCE_layer_binary(); const vector &sim_pT4_matched(); - const vector &T3T3_rPhiChiSquared(); const vector &tc_eta(); const vector &sim_lengap(); const vector &sim_T5_matched(); @@ -826,7 +728,6 @@ namespace tas { const vector &pLS_isDuplicate(); const vector &tce_anchorIndex(); const vector &t5_occupancies(); - const vector &T3T3_outerT3Radius(); const vector &tc_type(); const vector &tce_isFake(); const vector &pLS_pt(); @@ -834,7 +735,6 @@ namespace tas { const vector > &sim_T4_types(); const vector &pT4_isDuplicate(); const vector &t4_pt(); - const vector > &T3T3_nHitOverlaps(); const vector > &sim_TC_types(); const vector &sg_occupancies(); const vector &pT4_pt(); diff --git a/efficiency/python/lst_plot_performance.py b/efficiency/python/lst_plot_performance.py index f22b4c4f1..857766c48 100755 --- a/efficiency/python/lst_plot_performance.py +++ b/efficiency/python/lst_plot_performance.py @@ -379,8 +379,6 @@ def parse_plot_name(output_name): rtnstr.append("Triplet") elif "TCE_" in output_name: rtnstr.append("Extended Track") - elif "T3T3_" in output_name: - rtnstr.append("T3T3 Extensions") elif "pureTCE_" in output_name: rtnstr.append("Pure Extensions") elif "TC_" in output_name: diff --git a/efficiency/python/plot_performance.py b/efficiency/python/plot_performance.py index 52a222f66..e10fb7277 100644 --- a/efficiency/python/plot_performance.py +++ b/efficiency/python/plot_performance.py @@ -40,8 +40,6 @@ def parse_plot_name(output_name): rtnstr.append("Triplet") elif "TCE_" in output_name: rtnstr.append("Extended Track") - elif "T3T3_" in output_name: - rtnstr.append("T3T3 Extensions") elif "pureTCE_" in output_name: rtnstr.append("Pure Extensions") elif "TC_" in output_name: diff --git a/efficiency/src/SDL.cc b/efficiency/src/SDL.cc index 86079133e..0db9b5820 100644 --- a/efficiency/src/SDL.cc +++ b/efficiency/src/SDL.cc @@ -43,21 +43,11 @@ void SDL::Init(TTree *tree) { sim_eta_branch = tree->GetBranch("sim_eta"); if (sim_eta_branch) { sim_eta_branch->SetAddress(&sim_eta_); } } - T3T3_layer_binary_branch = 0; - if (tree->GetBranch("T3T3_layer_binary") != 0) { - T3T3_layer_binary_branch = tree->GetBranch("T3T3_layer_binary"); - if (T3T3_layer_binary_branch) { T3T3_layer_binary_branch->SetAddress(&T3T3_layer_binary_); } - } pT3_foundDuplicate_branch = 0; if (tree->GetBranch("pT3_foundDuplicate") != 0) { pT3_foundDuplicate_branch = tree->GetBranch("pT3_foundDuplicate"); if (pT3_foundDuplicate_branch) { pT3_foundDuplicate_branch->SetAddress(&pT3_foundDuplicate_); } } - sim_T3T3_matched_branch = 0; - if (tree->GetBranch("sim_T3T3_matched") != 0) { - sim_T3T3_matched_branch = tree->GetBranch("sim_T3T3_matched"); - if (sim_T3T3_matched_branch) { sim_T3T3_matched_branch->SetAddress(&sim_T3T3_matched_); } - } sim_len_branch = 0; if (tree->GetBranch("sim_len") != 0) { sim_len_branch = tree->GetBranch("sim_len"); @@ -83,11 +73,6 @@ void SDL::Init(TTree *tree) { sim_denom_branch = tree->GetBranch("sim_denom"); if (sim_denom_branch) { sim_denom_branch->SetAddress(&sim_denom_); } } - T3T3_anchorIndex_branch = 0; - if (tree->GetBranch("T3T3_anchorIndex") != 0) { - T3T3_anchorIndex_branch = tree->GetBranch("T3T3_anchorIndex"); - if (T3T3_anchorIndex_branch) { T3T3_anchorIndex_branch->SetAddress(&T3T3_anchorIndex_); } - } pT5_isDuplicate_branch = 0; if (tree->GetBranch("pT5_isDuplicate") != 0) { pT5_isDuplicate_branch = tree->GetBranch("pT5_isDuplicate"); @@ -123,11 +108,6 @@ void SDL::Init(TTree *tree) { pureTCE_rzChiSquared_branch = tree->GetBranch("pureTCE_rzChiSquared"); if (pureTCE_rzChiSquared_branch) { pureTCE_rzChiSquared_branch->SetAddress(&pureTCE_rzChiSquared_); } } - T3T3_regressionRadius_branch = 0; - if (tree->GetBranch("T3T3_regressionRadius") != 0) { - T3T3_regressionRadius_branch = tree->GetBranch("T3T3_regressionRadius"); - if (T3T3_regressionRadius_branch) { T3T3_regressionRadius_branch->SetAddress(&T3T3_regressionRadius_); } - } t4_isDuplicate_branch = 0; if (tree->GetBranch("t4_isDuplicate") != 0) { t4_isDuplicate_branch = tree->GetBranch("t4_isDuplicate"); @@ -163,26 +143,6 @@ void SDL::Init(TTree *tree) { t5_eta_2_branch = tree->GetBranch("t5_eta_2"); if (t5_eta_2_branch) { t5_eta_2_branch->SetAddress(&t5_eta_2_); } } - T3T3_pt_branch = 0; - if (tree->GetBranch("T3T3_pt") != 0) { - T3T3_pt_branch = tree->GetBranch("T3T3_pt"); - if (T3T3_pt_branch) { T3T3_pt_branch->SetAddress(&T3T3_pt_); } - } - T3T3_maxHitMatchedCounts_branch = 0; - if (tree->GetBranch("T3T3_maxHitMatchedCounts") != 0) { - T3T3_maxHitMatchedCounts_branch = tree->GetBranch("T3T3_maxHitMatchedCounts"); - if (T3T3_maxHitMatchedCounts_branch) { T3T3_maxHitMatchedCounts_branch->SetAddress(&T3T3_maxHitMatchedCounts_); } - } - T3T3_anchorType_branch = 0; - if (tree->GetBranch("T3T3_anchorType") != 0) { - T3T3_anchorType_branch = tree->GetBranch("T3T3_anchorType"); - if (T3T3_anchorType_branch) { T3T3_anchorType_branch->SetAddress(&T3T3_anchorType_); } - } - T3T3_nLayerOverlaps_branch = 0; - if (tree->GetBranch("T3T3_nLayerOverlaps") != 0) { - T3T3_nLayerOverlaps_branch = tree->GetBranch("T3T3_nLayerOverlaps"); - if (T3T3_nLayerOverlaps_branch) { T3T3_nLayerOverlaps_branch->SetAddress(&T3T3_nLayerOverlaps_); } - } pLS_eta_branch = 0; if (tree->GetBranch("pLS_eta") != 0) { pLS_eta_branch = tree->GetBranch("pLS_eta"); @@ -203,11 +163,6 @@ void SDL::Init(TTree *tree) { tce_layer_binary_branch = tree->GetBranch("tce_layer_binary"); if (tce_layer_binary_branch) { tce_layer_binary_branch->SetAddress(&tce_layer_binary_); } } - sim_T3T3_types_branch = 0; - if (tree->GetBranch("sim_T3T3_types") != 0) { - sim_T3T3_types_branch = tree->GetBranch("sim_T3T3_types"); - if (sim_T3T3_types_branch) { sim_T3T3_types_branch->SetAddress(&sim_T3T3_types_); } - } sim_TC_matched_nonextended_branch = 0; if (tree->GetBranch("sim_TC_matched_nonextended") != 0) { sim_TC_matched_nonextended_branch = tree->GetBranch("sim_TC_matched_nonextended"); @@ -223,11 +178,6 @@ void SDL::Init(TTree *tree) { tce_eta_branch = tree->GetBranch("tce_eta"); if (tce_eta_branch) { tce_eta_branch->SetAddress(&tce_eta_); } } - T3T3_rzChiSquared_branch = 0; - if (tree->GetBranch("T3T3_rzChiSquared") != 0) { - T3T3_rzChiSquared_branch = tree->GetBranch("T3T3_rzChiSquared"); - if (T3T3_rzChiSquared_branch) { T3T3_rzChiSquared_branch->SetAddress(&T3T3_rzChiSquared_); } - } tce_isDuplicate_branch = 0; if (tree->GetBranch("tce_isDuplicate") != 0) { tce_isDuplicate_branch = tree->GetBranch("tce_isDuplicate"); @@ -308,11 +258,6 @@ void SDL::Init(TTree *tree) { sim_pureTCE_types_branch = tree->GetBranch("sim_pureTCE_types"); if (sim_pureTCE_types_branch) { sim_pureTCE_types_branch->SetAddress(&sim_pureTCE_types_); } } - T3T3_hitIdxs_branch = 0; - if (tree->GetBranch("T3T3_hitIdxs") != 0) { - T3T3_hitIdxs_branch = tree->GetBranch("T3T3_hitIdxs"); - if (T3T3_hitIdxs_branch) { T3T3_hitIdxs_branch->SetAddress(&T3T3_hitIdxs_); } - } t4_phi_branch = 0; if (tree->GetBranch("t4_phi") != 0) { t4_phi_branch = tree->GetBranch("t4_phi"); @@ -378,11 +323,6 @@ void SDL::Init(TTree *tree) { sim_pca_dxy_branch = tree->GetBranch("sim_pca_dxy"); if (sim_pca_dxy_branch) { sim_pca_dxy_branch->SetAddress(&sim_pca_dxy_); } } - T3T3_isDuplicate_branch = 0; - if (tree->GetBranch("T3T3_isDuplicate") != 0) { - T3T3_isDuplicate_branch = tree->GetBranch("T3T3_isDuplicate"); - if (T3T3_isDuplicate_branch) { T3T3_isDuplicate_branch->SetAddress(&T3T3_isDuplicate_); } - } pT4_phi_branch = 0; if (tree->GetBranch("pT4_phi") != 0) { pT4_phi_branch = tree->GetBranch("pT4_phi"); @@ -403,21 +343,11 @@ void SDL::Init(TTree *tree) { sim_pureTCE_matched_branch = tree->GetBranch("sim_pureTCE_matched"); if (sim_pureTCE_matched_branch) { sim_pureTCE_matched_branch->SetAddress(&sim_pureTCE_matched_); } } - T3T3_eta_branch = 0; - if (tree->GetBranch("T3T3_eta") != 0) { - T3T3_eta_branch = tree->GetBranch("T3T3_eta"); - if (T3T3_eta_branch) { T3T3_eta_branch->SetAddress(&T3T3_eta_); } - } t3_occupancies_branch = 0; if (tree->GetBranch("t3_occupancies") != 0) { t3_occupancies_branch = tree->GetBranch("t3_occupancies"); if (t3_occupancies_branch) { t3_occupancies_branch->SetAddress(&t3_occupancies_); } } - T3T3_matched_simIdx_branch = 0; - if (tree->GetBranch("T3T3_matched_simIdx") != 0) { - T3T3_matched_simIdx_branch = tree->GetBranch("T3T3_matched_simIdx"); - if (T3T3_matched_simIdx_branch) { T3T3_matched_simIdx_branch->SetAddress(&T3T3_matched_simIdx_); } - } t5_foundDuplicate_branch = 0; if (tree->GetBranch("t5_foundDuplicate") != 0) { t5_foundDuplicate_branch = tree->GetBranch("t5_foundDuplicate"); @@ -428,11 +358,6 @@ void SDL::Init(TTree *tree) { sim_pT4_types_branch = tree->GetBranch("sim_pT4_types"); if (sim_pT4_types_branch) { sim_pT4_types_branch->SetAddress(&sim_pT4_types_); } } - T3T3_matched_pt_branch = 0; - if (tree->GetBranch("T3T3_matched_pt") != 0) { - T3T3_matched_pt_branch = tree->GetBranch("T3T3_matched_pt"); - if (T3T3_matched_pt_branch) { T3T3_matched_pt_branch->SetAddress(&T3T3_matched_pt_); } - } t4_isFake_branch = 0; if (tree->GetBranch("t4_isFake") != 0) { t4_isFake_branch = tree->GetBranch("t4_isFake"); @@ -483,11 +408,6 @@ void SDL::Init(TTree *tree) { pT5_pt_branch = tree->GetBranch("pT5_pt"); if (pT5_pt_branch) { pT5_pt_branch->SetAddress(&pT5_pt_); } } - T3T3_isFake_branch = 0; - if (tree->GetBranch("T3T3_isFake") != 0) { - T3T3_isFake_branch = tree->GetBranch("T3T3_isFake"); - if (T3T3_isFake_branch) { T3T3_isFake_branch->SetAddress(&T3T3_isFake_); } - } pureTCE_rPhiChiSquared_branch = 0; if (tree->GetBranch("pureTCE_rPhiChiSquared") != 0) { pureTCE_rPhiChiSquared_branch = tree->GetBranch("pureTCE_rPhiChiSquared"); @@ -513,11 +433,6 @@ void SDL::Init(TTree *tree) { tc_maxHitMatchedCounts_branch = tree->GetBranch("tc_maxHitMatchedCounts"); if (tc_maxHitMatchedCounts_branch) { tc_maxHitMatchedCounts_branch->SetAddress(&tc_maxHitMatchedCounts_); } } - T3T3_phi_branch = 0; - if (tree->GetBranch("T3T3_phi") != 0) { - T3T3_phi_branch = tree->GetBranch("T3T3_phi"); - if (T3T3_phi_branch) { T3T3_phi_branch->SetAddress(&T3T3_phi_); } - } pureTCE_nLayerOverlaps_branch = 0; if (tree->GetBranch("pureTCE_nLayerOverlaps") != 0) { pureTCE_nLayerOverlaps_branch = tree->GetBranch("pureTCE_nLayerOverlaps"); @@ -568,11 +483,6 @@ void SDL::Init(TTree *tree) { pT5_eta_branch = tree->GetBranch("pT5_eta"); if (pT5_eta_branch) { pT5_eta_branch->SetAddress(&pT5_eta_); } } - T3T3_innerT3Radius_branch = 0; - if (tree->GetBranch("T3T3_innerT3Radius") != 0) { - T3T3_innerT3Radius_branch = tree->GetBranch("T3T3_innerT3Radius"); - if (T3T3_innerT3Radius_branch) { T3T3_innerT3Radius_branch->SetAddress(&T3T3_innerT3Radius_); } - } tc_phi_branch = 0; if (tree->GetBranch("tc_phi") != 0) { tc_phi_branch = tree->GetBranch("tc_phi"); @@ -623,11 +533,6 @@ void SDL::Init(TTree *tree) { sim_pT4_matched_branch = tree->GetBranch("sim_pT4_matched"); if (sim_pT4_matched_branch) { sim_pT4_matched_branch->SetAddress(&sim_pT4_matched_); } } - T3T3_rPhiChiSquared_branch = 0; - if (tree->GetBranch("T3T3_rPhiChiSquared") != 0) { - T3T3_rPhiChiSquared_branch = tree->GetBranch("T3T3_rPhiChiSquared"); - if (T3T3_rPhiChiSquared_branch) { T3T3_rPhiChiSquared_branch->SetAddress(&T3T3_rPhiChiSquared_); } - } tc_eta_branch = 0; if (tree->GetBranch("tc_eta") != 0) { tc_eta_branch = tree->GetBranch("tc_eta"); @@ -703,11 +608,6 @@ void SDL::Init(TTree *tree) { t5_occupancies_branch = tree->GetBranch("t5_occupancies"); if (t5_occupancies_branch) { t5_occupancies_branch->SetAddress(&t5_occupancies_); } } - T3T3_outerT3Radius_branch = 0; - if (tree->GetBranch("T3T3_outerT3Radius") != 0) { - T3T3_outerT3Radius_branch = tree->GetBranch("T3T3_outerT3Radius"); - if (T3T3_outerT3Radius_branch) { T3T3_outerT3Radius_branch->SetAddress(&T3T3_outerT3Radius_); } - } tc_type_branch = 0; if (tree->GetBranch("tc_type") != 0) { tc_type_branch = tree->GetBranch("tc_type"); @@ -743,11 +643,6 @@ void SDL::Init(TTree *tree) { t4_pt_branch = tree->GetBranch("t4_pt"); if (t4_pt_branch) { t4_pt_branch->SetAddress(&t4_pt_); } } - T3T3_nHitOverlaps_branch = 0; - if (tree->GetBranch("T3T3_nHitOverlaps") != 0) { - T3T3_nHitOverlaps_branch = tree->GetBranch("T3T3_nHitOverlaps"); - if (T3T3_nHitOverlaps_branch) { T3T3_nHitOverlaps_branch->SetAddress(&T3T3_nHitOverlaps_); } - } sim_TC_types_branch = 0; if (tree->GetBranch("sim_TC_types") != 0) { sim_TC_types_branch = tree->GetBranch("sim_TC_types"); @@ -850,15 +745,12 @@ void SDL::GetEntry(unsigned int idx) { sim_event_isLoaded = false; sim_q_isLoaded = false; sim_eta_isLoaded = false; - T3T3_layer_binary_isLoaded = false; pT3_foundDuplicate_isLoaded = false; - sim_T3T3_matched_isLoaded = false; sim_len_isLoaded = false; pureTCE_isDuplicate_isLoaded = false; pT3_score_isLoaded = false; t5_eta_isLoaded = false; sim_denom_isLoaded = false; - T3T3_anchorIndex_isLoaded = false; pT5_isDuplicate_isLoaded = false; sim_tce_matched_isLoaded = false; pT3_isDuplicate_isLoaded = false; @@ -866,7 +758,6 @@ void SDL::GetEntry(unsigned int idx) { pT3_eta_2_isLoaded = false; sim_pT3_matched_isLoaded = false; pureTCE_rzChiSquared_isLoaded = false; - T3T3_regressionRadius_isLoaded = false; t4_isDuplicate_isLoaded = false; pureTCE_eta_isLoaded = false; tce_rPhiChiSquared_isLoaded = false; @@ -874,19 +765,13 @@ void SDL::GetEntry(unsigned int idx) { pureTCE_pt_isLoaded = false; sim_pt_isLoaded = false; t5_eta_2_isLoaded = false; - T3T3_pt_isLoaded = false; - T3T3_maxHitMatchedCounts_isLoaded = false; - T3T3_anchorType_isLoaded = false; - T3T3_nLayerOverlaps_isLoaded = false; pLS_eta_isLoaded = false; sim_pdgId_isLoaded = false; t3_eta_isLoaded = false; tce_layer_binary_isLoaded = false; - sim_T3T3_types_isLoaded = false; sim_TC_matched_nonextended_isLoaded = false; t4_occupancies_isLoaded = false; tce_eta_isLoaded = false; - T3T3_rzChiSquared_isLoaded = false; tce_isDuplicate_isLoaded = false; pT5_matched_simIdx_isLoaded = false; sim_tcIdx_isLoaded = false; @@ -903,7 +788,6 @@ void SDL::GetEntry(unsigned int idx) { t5_hitIdxs_isLoaded = false; sim_pT3_types_isLoaded = false; sim_pureTCE_types_isLoaded = false; - T3T3_hitIdxs_isLoaded = false; t4_phi_isLoaded = false; t5_phi_isLoaded = false; pT5_hitIdxs_isLoaded = false; @@ -917,17 +801,13 @@ void SDL::GetEntry(unsigned int idx) { tc_sim_isLoaded = false; sim_pLS_types_isLoaded = false; sim_pca_dxy_isLoaded = false; - T3T3_isDuplicate_isLoaded = false; pT4_phi_isLoaded = false; sim_hits_isLoaded = false; pLS_phi_isLoaded = false; sim_pureTCE_matched_isLoaded = false; - T3T3_eta_isLoaded = false; t3_occupancies_isLoaded = false; - T3T3_matched_simIdx_isLoaded = false; t5_foundDuplicate_isLoaded = false; sim_pT4_types_isLoaded = false; - T3T3_matched_pt_isLoaded = false; t4_isFake_isLoaded = false; simvtx_x_isLoaded = false; simvtx_y_isLoaded = false; @@ -938,13 +818,11 @@ void SDL::GetEntry(unsigned int idx) { tc_pt_isLoaded = false; pT3_phi_2_isLoaded = false; pT5_pt_isLoaded = false; - T3T3_isFake_isLoaded = false; pureTCE_rPhiChiSquared_isLoaded = false; pT5_score_isLoaded = false; sim_phi_isLoaded = false; pT5_isFake_isLoaded = false; tc_maxHitMatchedCounts_isLoaded = false; - T3T3_phi_isLoaded = false; pureTCE_nLayerOverlaps_isLoaded = false; sim_pca_dz_isLoaded = false; pureTCE_hitIdxs_isLoaded = false; @@ -955,7 +833,6 @@ void SDL::GetEntry(unsigned int idx) { pLS_score_isLoaded = false; pT3_phi_isLoaded = false; pT5_eta_isLoaded = false; - T3T3_innerT3Radius_isLoaded = false; tc_phi_isLoaded = false; t4_eta_isLoaded = false; pLS_isFake_isLoaded = false; @@ -966,7 +843,6 @@ void SDL::GetEntry(unsigned int idx) { sim_parentVtxIdx_isLoaded = false; pureTCE_layer_binary_isLoaded = false; sim_pT4_matched_isLoaded = false; - T3T3_rPhiChiSquared_isLoaded = false; tc_eta_isLoaded = false; sim_lengap_isLoaded = false; sim_T5_matched_isLoaded = false; @@ -982,7 +858,6 @@ void SDL::GetEntry(unsigned int idx) { pLS_isDuplicate_isLoaded = false; tce_anchorIndex_isLoaded = false; t5_occupancies_isLoaded = false; - T3T3_outerT3Radius_isLoaded = false; tc_type_isLoaded = false; tce_isFake_isLoaded = false; pLS_pt_isLoaded = false; @@ -990,7 +865,6 @@ void SDL::GetEntry(unsigned int idx) { sim_T4_types_isLoaded = false; pT4_isDuplicate_isLoaded = false; t4_pt_isLoaded = false; - T3T3_nHitOverlaps_isLoaded = false; sim_TC_types_isLoaded = false; sg_occupancies_isLoaded = false; pT4_pt_isLoaded = false; @@ -1019,15 +893,12 @@ void SDL::LoadAllBranches() { if (sim_event_branch != 0) sim_event(); if (sim_q_branch != 0) sim_q(); if (sim_eta_branch != 0) sim_eta(); - if (T3T3_layer_binary_branch != 0) T3T3_layer_binary(); if (pT3_foundDuplicate_branch != 0) pT3_foundDuplicate(); - if (sim_T3T3_matched_branch != 0) sim_T3T3_matched(); if (sim_len_branch != 0) sim_len(); if (pureTCE_isDuplicate_branch != 0) pureTCE_isDuplicate(); if (pT3_score_branch != 0) pT3_score(); if (t5_eta_branch != 0) t5_eta(); if (sim_denom_branch != 0) sim_denom(); - if (T3T3_anchorIndex_branch != 0) T3T3_anchorIndex(); if (pT5_isDuplicate_branch != 0) pT5_isDuplicate(); if (sim_tce_matched_branch != 0) sim_tce_matched(); if (pT3_isDuplicate_branch != 0) pT3_isDuplicate(); @@ -1035,7 +906,6 @@ void SDL::LoadAllBranches() { if (pT3_eta_2_branch != 0) pT3_eta_2(); if (sim_pT3_matched_branch != 0) sim_pT3_matched(); if (pureTCE_rzChiSquared_branch != 0) pureTCE_rzChiSquared(); - if (T3T3_regressionRadius_branch != 0) T3T3_regressionRadius(); if (t4_isDuplicate_branch != 0) t4_isDuplicate(); if (pureTCE_eta_branch != 0) pureTCE_eta(); if (tce_rPhiChiSquared_branch != 0) tce_rPhiChiSquared(); @@ -1043,19 +913,13 @@ void SDL::LoadAllBranches() { if (pureTCE_pt_branch != 0) pureTCE_pt(); if (sim_pt_branch != 0) sim_pt(); if (t5_eta_2_branch != 0) t5_eta_2(); - if (T3T3_pt_branch != 0) T3T3_pt(); - if (T3T3_maxHitMatchedCounts_branch != 0) T3T3_maxHitMatchedCounts(); - if (T3T3_anchorType_branch != 0) T3T3_anchorType(); - if (T3T3_nLayerOverlaps_branch != 0) T3T3_nLayerOverlaps(); if (pLS_eta_branch != 0) pLS_eta(); if (sim_pdgId_branch != 0) sim_pdgId(); if (t3_eta_branch != 0) t3_eta(); if (tce_layer_binary_branch != 0) tce_layer_binary(); - if (sim_T3T3_types_branch != 0) sim_T3T3_types(); if (sim_TC_matched_nonextended_branch != 0) sim_TC_matched_nonextended(); if (t4_occupancies_branch != 0) t4_occupancies(); if (tce_eta_branch != 0) tce_eta(); - if (T3T3_rzChiSquared_branch != 0) T3T3_rzChiSquared(); if (tce_isDuplicate_branch != 0) tce_isDuplicate(); if (pT5_matched_simIdx_branch != 0) pT5_matched_simIdx(); if (sim_tcIdx_branch != 0) sim_tcIdx(); @@ -1072,7 +936,6 @@ void SDL::LoadAllBranches() { if (t5_hitIdxs_branch != 0) t5_hitIdxs(); if (sim_pT3_types_branch != 0) sim_pT3_types(); if (sim_pureTCE_types_branch != 0) sim_pureTCE_types(); - if (T3T3_hitIdxs_branch != 0) T3T3_hitIdxs(); if (t4_phi_branch != 0) t4_phi(); if (t5_phi_branch != 0) t5_phi(); if (pT5_hitIdxs_branch != 0) pT5_hitIdxs(); @@ -1086,17 +949,13 @@ void SDL::LoadAllBranches() { if (tc_sim_branch != 0) tc_sim(); if (sim_pLS_types_branch != 0) sim_pLS_types(); if (sim_pca_dxy_branch != 0) sim_pca_dxy(); - if (T3T3_isDuplicate_branch != 0) T3T3_isDuplicate(); if (pT4_phi_branch != 0) pT4_phi(); if (sim_hits_branch != 0) sim_hits(); if (pLS_phi_branch != 0) pLS_phi(); if (sim_pureTCE_matched_branch != 0) sim_pureTCE_matched(); - if (T3T3_eta_branch != 0) T3T3_eta(); if (t3_occupancies_branch != 0) t3_occupancies(); - if (T3T3_matched_simIdx_branch != 0) T3T3_matched_simIdx(); if (t5_foundDuplicate_branch != 0) t5_foundDuplicate(); if (sim_pT4_types_branch != 0) sim_pT4_types(); - if (T3T3_matched_pt_branch != 0) T3T3_matched_pt(); if (t4_isFake_branch != 0) t4_isFake(); if (simvtx_x_branch != 0) simvtx_x(); if (simvtx_y_branch != 0) simvtx_y(); @@ -1107,13 +966,11 @@ void SDL::LoadAllBranches() { if (tc_pt_branch != 0) tc_pt(); if (pT3_phi_2_branch != 0) pT3_phi_2(); if (pT5_pt_branch != 0) pT5_pt(); - if (T3T3_isFake_branch != 0) T3T3_isFake(); if (pureTCE_rPhiChiSquared_branch != 0) pureTCE_rPhiChiSquared(); if (pT5_score_branch != 0) pT5_score(); if (sim_phi_branch != 0) sim_phi(); if (pT5_isFake_branch != 0) pT5_isFake(); if (tc_maxHitMatchedCounts_branch != 0) tc_maxHitMatchedCounts(); - if (T3T3_phi_branch != 0) T3T3_phi(); if (pureTCE_nLayerOverlaps_branch != 0) pureTCE_nLayerOverlaps(); if (sim_pca_dz_branch != 0) sim_pca_dz(); if (pureTCE_hitIdxs_branch != 0) pureTCE_hitIdxs(); @@ -1124,7 +981,6 @@ void SDL::LoadAllBranches() { if (pLS_score_branch != 0) pLS_score(); if (pT3_phi_branch != 0) pT3_phi(); if (pT5_eta_branch != 0) pT5_eta(); - if (T3T3_innerT3Radius_branch != 0) T3T3_innerT3Radius(); if (tc_phi_branch != 0) tc_phi(); if (t4_eta_branch != 0) t4_eta(); if (pLS_isFake_branch != 0) pLS_isFake(); @@ -1135,7 +991,6 @@ void SDL::LoadAllBranches() { if (sim_parentVtxIdx_branch != 0) sim_parentVtxIdx(); if (pureTCE_layer_binary_branch != 0) pureTCE_layer_binary(); if (sim_pT4_matched_branch != 0) sim_pT4_matched(); - if (T3T3_rPhiChiSquared_branch != 0) T3T3_rPhiChiSquared(); if (tc_eta_branch != 0) tc_eta(); if (sim_lengap_branch != 0) sim_lengap(); if (sim_T5_matched_branch != 0) sim_T5_matched(); @@ -1151,7 +1006,6 @@ void SDL::LoadAllBranches() { if (pLS_isDuplicate_branch != 0) pLS_isDuplicate(); if (tce_anchorIndex_branch != 0) tce_anchorIndex(); if (t5_occupancies_branch != 0) t5_occupancies(); - if (T3T3_outerT3Radius_branch != 0) T3T3_outerT3Radius(); if (tc_type_branch != 0) tc_type(); if (tce_isFake_branch != 0) tce_isFake(); if (pLS_pt_branch != 0) pLS_pt(); @@ -1159,7 +1013,6 @@ void SDL::LoadAllBranches() { if (sim_T4_types_branch != 0) sim_T4_types(); if (pT4_isDuplicate_branch != 0) pT4_isDuplicate(); if (t4_pt_branch != 0) t4_pt(); - if (T3T3_nHitOverlaps_branch != 0) T3T3_nHitOverlaps(); if (sim_TC_types_branch != 0) sim_TC_types(); if (sg_occupancies_branch != 0) sg_occupancies(); if (pT4_pt_branch != 0) pT4_pt(); @@ -1275,18 +1128,6 @@ const vector &SDL::sim_eta() { } return *sim_eta_; } -const vector &SDL::T3T3_layer_binary() { - if (not T3T3_layer_binary_isLoaded) { - if (T3T3_layer_binary_branch != 0) { - T3T3_layer_binary_branch->GetEntry(index); - } else { - printf("branch T3T3_layer_binary_branch does not exist!\n"); - exit(1); - } - T3T3_layer_binary_isLoaded = true; - } - return *T3T3_layer_binary_; -} const vector &SDL::pT3_foundDuplicate() { if (not pT3_foundDuplicate_isLoaded) { if (pT3_foundDuplicate_branch != 0) { @@ -1299,18 +1140,6 @@ const vector &SDL::pT3_foundDuplicate() { } return *pT3_foundDuplicate_; } -const vector &SDL::sim_T3T3_matched() { - if (not sim_T3T3_matched_isLoaded) { - if (sim_T3T3_matched_branch != 0) { - sim_T3T3_matched_branch->GetEntry(index); - } else { - printf("branch sim_T3T3_matched_branch does not exist!\n"); - exit(1); - } - sim_T3T3_matched_isLoaded = true; - } - return *sim_T3T3_matched_; -} const vector &SDL::sim_len() { if (not sim_len_isLoaded) { if (sim_len_branch != 0) { @@ -1371,18 +1200,6 @@ const vector &SDL::sim_denom() { } return *sim_denom_; } -const vector &SDL::T3T3_anchorIndex() { - if (not T3T3_anchorIndex_isLoaded) { - if (T3T3_anchorIndex_branch != 0) { - T3T3_anchorIndex_branch->GetEntry(index); - } else { - printf("branch T3T3_anchorIndex_branch does not exist!\n"); - exit(1); - } - T3T3_anchorIndex_isLoaded = true; - } - return *T3T3_anchorIndex_; -} const vector &SDL::pT5_isDuplicate() { if (not pT5_isDuplicate_isLoaded) { if (pT5_isDuplicate_branch != 0) { @@ -1467,18 +1284,6 @@ const vector &SDL::pureTCE_rzChiSquared() { } return *pureTCE_rzChiSquared_; } -const vector &SDL::T3T3_regressionRadius() { - if (not T3T3_regressionRadius_isLoaded) { - if (T3T3_regressionRadius_branch != 0) { - T3T3_regressionRadius_branch->GetEntry(index); - } else { - printf("branch T3T3_regressionRadius_branch does not exist!\n"); - exit(1); - } - T3T3_regressionRadius_isLoaded = true; - } - return *T3T3_regressionRadius_; -} const vector &SDL::t4_isDuplicate() { if (not t4_isDuplicate_isLoaded) { if (t4_isDuplicate_branch != 0) { @@ -1563,54 +1368,6 @@ const vector &SDL::t5_eta_2() { } return *t5_eta_2_; } -const vector &SDL::T3T3_pt() { - if (not T3T3_pt_isLoaded) { - if (T3T3_pt_branch != 0) { - T3T3_pt_branch->GetEntry(index); - } else { - printf("branch T3T3_pt_branch does not exist!\n"); - exit(1); - } - T3T3_pt_isLoaded = true; - } - return *T3T3_pt_; -} -const vector &SDL::T3T3_maxHitMatchedCounts() { - if (not T3T3_maxHitMatchedCounts_isLoaded) { - if (T3T3_maxHitMatchedCounts_branch != 0) { - T3T3_maxHitMatchedCounts_branch->GetEntry(index); - } else { - printf("branch T3T3_maxHitMatchedCounts_branch does not exist!\n"); - exit(1); - } - T3T3_maxHitMatchedCounts_isLoaded = true; - } - return *T3T3_maxHitMatchedCounts_; -} -const vector &SDL::T3T3_anchorType() { - if (not T3T3_anchorType_isLoaded) { - if (T3T3_anchorType_branch != 0) { - T3T3_anchorType_branch->GetEntry(index); - } else { - printf("branch T3T3_anchorType_branch does not exist!\n"); - exit(1); - } - T3T3_anchorType_isLoaded = true; - } - return *T3T3_anchorType_; -} -const vector > &SDL::T3T3_nLayerOverlaps() { - if (not T3T3_nLayerOverlaps_isLoaded) { - if (T3T3_nLayerOverlaps_branch != 0) { - T3T3_nLayerOverlaps_branch->GetEntry(index); - } else { - printf("branch T3T3_nLayerOverlaps_branch does not exist!\n"); - exit(1); - } - T3T3_nLayerOverlaps_isLoaded = true; - } - return *T3T3_nLayerOverlaps_; -} const vector &SDL::pLS_eta() { if (not pLS_eta_isLoaded) { if (pLS_eta_branch != 0) { @@ -1659,18 +1416,6 @@ const vector &SDL::tce_layer_binary() { } return *tce_layer_binary_; } -const vector > &SDL::sim_T3T3_types() { - if (not sim_T3T3_types_isLoaded) { - if (sim_T3T3_types_branch != 0) { - sim_T3T3_types_branch->GetEntry(index); - } else { - printf("branch sim_T3T3_types_branch does not exist!\n"); - exit(1); - } - sim_T3T3_types_isLoaded = true; - } - return *sim_T3T3_types_; -} const vector &SDL::sim_TC_matched_nonextended() { if (not sim_TC_matched_nonextended_isLoaded) { if (sim_TC_matched_nonextended_branch != 0) { @@ -1707,18 +1452,6 @@ const vector &SDL::tce_eta() { } return *tce_eta_; } -const vector &SDL::T3T3_rzChiSquared() { - if (not T3T3_rzChiSquared_isLoaded) { - if (T3T3_rzChiSquared_branch != 0) { - T3T3_rzChiSquared_branch->GetEntry(index); - } else { - printf("branch T3T3_rzChiSquared_branch does not exist!\n"); - exit(1); - } - T3T3_rzChiSquared_isLoaded = true; - } - return *T3T3_rzChiSquared_; -} const vector &SDL::tce_isDuplicate() { if (not tce_isDuplicate_isLoaded) { if (tce_isDuplicate_branch != 0) { @@ -1911,18 +1644,6 @@ const vector > &SDL::sim_pureTCE_types() { } return *sim_pureTCE_types_; } -const vector > &SDL::T3T3_hitIdxs() { - if (not T3T3_hitIdxs_isLoaded) { - if (T3T3_hitIdxs_branch != 0) { - T3T3_hitIdxs_branch->GetEntry(index); - } else { - printf("branch T3T3_hitIdxs_branch does not exist!\n"); - exit(1); - } - T3T3_hitIdxs_isLoaded = true; - } - return *T3T3_hitIdxs_; -} const vector &SDL::t4_phi() { if (not t4_phi_isLoaded) { if (t4_phi_branch != 0) { @@ -2079,18 +1800,6 @@ const vector &SDL::sim_pca_dxy() { } return *sim_pca_dxy_; } -const vector &SDL::T3T3_isDuplicate() { - if (not T3T3_isDuplicate_isLoaded) { - if (T3T3_isDuplicate_branch != 0) { - T3T3_isDuplicate_branch->GetEntry(index); - } else { - printf("branch T3T3_isDuplicate_branch does not exist!\n"); - exit(1); - } - T3T3_isDuplicate_isLoaded = true; - } - return *T3T3_isDuplicate_; -} const vector &SDL::pT4_phi() { if (not pT4_phi_isLoaded) { if (pT4_phi_branch != 0) { @@ -2139,18 +1848,6 @@ const vector &SDL::sim_pureTCE_matched() { } return *sim_pureTCE_matched_; } -const vector &SDL::T3T3_eta() { - if (not T3T3_eta_isLoaded) { - if (T3T3_eta_branch != 0) { - T3T3_eta_branch->GetEntry(index); - } else { - printf("branch T3T3_eta_branch does not exist!\n"); - exit(1); - } - T3T3_eta_isLoaded = true; - } - return *T3T3_eta_; -} const vector &SDL::t3_occupancies() { if (not t3_occupancies_isLoaded) { if (t3_occupancies_branch != 0) { @@ -2163,18 +1860,6 @@ const vector &SDL::t3_occupancies() { } return *t3_occupancies_; } -const vector > &SDL::T3T3_matched_simIdx() { - if (not T3T3_matched_simIdx_isLoaded) { - if (T3T3_matched_simIdx_branch != 0) { - T3T3_matched_simIdx_branch->GetEntry(index); - } else { - printf("branch T3T3_matched_simIdx_branch does not exist!\n"); - exit(1); - } - T3T3_matched_simIdx_isLoaded = true; - } - return *T3T3_matched_simIdx_; -} const vector &SDL::t5_foundDuplicate() { if (not t5_foundDuplicate_isLoaded) { if (t5_foundDuplicate_branch != 0) { @@ -2199,18 +1884,6 @@ const vector > &SDL::sim_pT4_types() { } return *sim_pT4_types_; } -const vector &SDL::T3T3_matched_pt() { - if (not T3T3_matched_pt_isLoaded) { - if (T3T3_matched_pt_branch != 0) { - T3T3_matched_pt_branch->GetEntry(index); - } else { - printf("branch T3T3_matched_pt_branch does not exist!\n"); - exit(1); - } - T3T3_matched_pt_isLoaded = true; - } - return *T3T3_matched_pt_; -} const vector &SDL::t4_isFake() { if (not t4_isFake_isLoaded) { if (t4_isFake_branch != 0) { @@ -2331,18 +2004,6 @@ const vector &SDL::pT5_pt() { } return *pT5_pt_; } -const vector &SDL::T3T3_isFake() { - if (not T3T3_isFake_isLoaded) { - if (T3T3_isFake_branch != 0) { - T3T3_isFake_branch->GetEntry(index); - } else { - printf("branch T3T3_isFake_branch does not exist!\n"); - exit(1); - } - T3T3_isFake_isLoaded = true; - } - return *T3T3_isFake_; -} const vector &SDL::pureTCE_rPhiChiSquared() { if (not pureTCE_rPhiChiSquared_isLoaded) { if (pureTCE_rPhiChiSquared_branch != 0) { @@ -2403,18 +2064,6 @@ const vector &SDL::tc_maxHitMatchedCounts() { } return *tc_maxHitMatchedCounts_; } -const vector &SDL::T3T3_phi() { - if (not T3T3_phi_isLoaded) { - if (T3T3_phi_branch != 0) { - T3T3_phi_branch->GetEntry(index); - } else { - printf("branch T3T3_phi_branch does not exist!\n"); - exit(1); - } - T3T3_phi_isLoaded = true; - } - return *T3T3_phi_; -} const vector > &SDL::pureTCE_nLayerOverlaps() { if (not pureTCE_nLayerOverlaps_isLoaded) { if (pureTCE_nLayerOverlaps_branch != 0) { @@ -2535,18 +2184,6 @@ const vector &SDL::pT5_eta() { } return *pT5_eta_; } -const vector &SDL::T3T3_innerT3Radius() { - if (not T3T3_innerT3Radius_isLoaded) { - if (T3T3_innerT3Radius_branch != 0) { - T3T3_innerT3Radius_branch->GetEntry(index); - } else { - printf("branch T3T3_innerT3Radius_branch does not exist!\n"); - exit(1); - } - T3T3_innerT3Radius_isLoaded = true; - } - return *T3T3_innerT3Radius_; -} const vector &SDL::tc_phi() { if (not tc_phi_isLoaded) { if (tc_phi_branch != 0) { @@ -2667,18 +2304,6 @@ const vector &SDL::sim_pT4_matched() { } return *sim_pT4_matched_; } -const vector &SDL::T3T3_rPhiChiSquared() { - if (not T3T3_rPhiChiSquared_isLoaded) { - if (T3T3_rPhiChiSquared_branch != 0) { - T3T3_rPhiChiSquared_branch->GetEntry(index); - } else { - printf("branch T3T3_rPhiChiSquared_branch does not exist!\n"); - exit(1); - } - T3T3_rPhiChiSquared_isLoaded = true; - } - return *T3T3_rPhiChiSquared_; -} const vector &SDL::tc_eta() { if (not tc_eta_isLoaded) { if (tc_eta_branch != 0) { @@ -2859,18 +2484,6 @@ const vector &SDL::t5_occupancies() { } return *t5_occupancies_; } -const vector &SDL::T3T3_outerT3Radius() { - if (not T3T3_outerT3Radius_isLoaded) { - if (T3T3_outerT3Radius_branch != 0) { - T3T3_outerT3Radius_branch->GetEntry(index); - } else { - printf("branch T3T3_outerT3Radius_branch does not exist!\n"); - exit(1); - } - T3T3_outerT3Radius_isLoaded = true; - } - return *T3T3_outerT3Radius_; -} const vector &SDL::tc_type() { if (not tc_type_isLoaded) { if (tc_type_branch != 0) { @@ -2955,18 +2568,6 @@ const vector &SDL::t4_pt() { } return *t4_pt_; } -const vector > &SDL::T3T3_nHitOverlaps() { - if (not T3T3_nHitOverlaps_isLoaded) { - if (T3T3_nHitOverlaps_branch != 0) { - T3T3_nHitOverlaps_branch->GetEntry(index); - } else { - printf("branch T3T3_nHitOverlaps_branch does not exist!\n"); - exit(1); - } - T3T3_nHitOverlaps_isLoaded = true; - } - return *T3T3_nHitOverlaps_; -} const vector > &SDL::sim_TC_types() { if (not sim_TC_types_isLoaded) { if (sim_TC_types_branch != 0) { @@ -3210,15 +2811,12 @@ namespace tas { const vector &sim_event() { return sdl.sim_event(); } const vector &sim_q() { return sdl.sim_q(); } const vector &sim_eta() { return sdl.sim_eta(); } - const vector &T3T3_layer_binary() { return sdl.T3T3_layer_binary(); } const vector &pT3_foundDuplicate() { return sdl.pT3_foundDuplicate(); } - const vector &sim_T3T3_matched() { return sdl.sim_T3T3_matched(); } const vector &sim_len() { return sdl.sim_len(); } const vector &pureTCE_isDuplicate() { return sdl.pureTCE_isDuplicate(); } const vector &pT3_score() { return sdl.pT3_score(); } const vector &t5_eta() { return sdl.t5_eta(); } const vector &sim_denom() { return sdl.sim_denom(); } - const vector &T3T3_anchorIndex() { return sdl.T3T3_anchorIndex(); } const vector &pT5_isDuplicate() { return sdl.pT5_isDuplicate(); } const vector &sim_tce_matched() { return sdl.sim_tce_matched(); } const vector &pT3_isDuplicate() { return sdl.pT3_isDuplicate(); } @@ -3226,7 +2824,6 @@ namespace tas { const vector &pT3_eta_2() { return sdl.pT3_eta_2(); } const vector &sim_pT3_matched() { return sdl.sim_pT3_matched(); } const vector &pureTCE_rzChiSquared() { return sdl.pureTCE_rzChiSquared(); } - const vector &T3T3_regressionRadius() { return sdl.T3T3_regressionRadius(); } const vector &t4_isDuplicate() { return sdl.t4_isDuplicate(); } const vector &pureTCE_eta() { return sdl.pureTCE_eta(); } const vector &tce_rPhiChiSquared() { return sdl.tce_rPhiChiSquared(); } @@ -3234,19 +2831,13 @@ namespace tas { const vector &pureTCE_pt() { return sdl.pureTCE_pt(); } const vector &sim_pt() { return sdl.sim_pt(); } const vector &t5_eta_2() { return sdl.t5_eta_2(); } - const vector &T3T3_pt() { return sdl.T3T3_pt(); } - const vector &T3T3_maxHitMatchedCounts() { return sdl.T3T3_maxHitMatchedCounts(); } - const vector &T3T3_anchorType() { return sdl.T3T3_anchorType(); } - const vector > &T3T3_nLayerOverlaps() { return sdl.T3T3_nLayerOverlaps(); } const vector &pLS_eta() { return sdl.pLS_eta(); } const vector &sim_pdgId() { return sdl.sim_pdgId(); } const vector &t3_eta() { return sdl.t3_eta(); } const vector &tce_layer_binary() { return sdl.tce_layer_binary(); } - const vector > &sim_T3T3_types() { return sdl.sim_T3T3_types(); } const vector &sim_TC_matched_nonextended() { return sdl.sim_TC_matched_nonextended(); } const vector &t4_occupancies() { return sdl.t4_occupancies(); } const vector &tce_eta() { return sdl.tce_eta(); } - const vector &T3T3_rzChiSquared() { return sdl.T3T3_rzChiSquared(); } const vector &tce_isDuplicate() { return sdl.tce_isDuplicate(); } const vector > &pT5_matched_simIdx() { return sdl.pT5_matched_simIdx(); } const vector > &sim_tcIdx() { return sdl.sim_tcIdx(); } @@ -3263,7 +2854,6 @@ namespace tas { const vector > &t5_hitIdxs() { return sdl.t5_hitIdxs(); } const vector > &sim_pT3_types() { return sdl.sim_pT3_types(); } const vector > &sim_pureTCE_types() { return sdl.sim_pureTCE_types(); } - const vector > &T3T3_hitIdxs() { return sdl.T3T3_hitIdxs(); } const vector &t4_phi() { return sdl.t4_phi(); } const vector &t5_phi() { return sdl.t5_phi(); } const vector > &pT5_hitIdxs() { return sdl.pT5_hitIdxs(); } @@ -3277,17 +2867,13 @@ namespace tas { const vector &tc_sim() { return sdl.tc_sim(); } const vector > &sim_pLS_types() { return sdl.sim_pLS_types(); } const vector &sim_pca_dxy() { return sdl.sim_pca_dxy(); } - const vector &T3T3_isDuplicate() { return sdl.T3T3_isDuplicate(); } const vector &pT4_phi() { return sdl.pT4_phi(); } const vector &sim_hits() { return sdl.sim_hits(); } const vector &pLS_phi() { return sdl.pLS_phi(); } const vector &sim_pureTCE_matched() { return sdl.sim_pureTCE_matched(); } - const vector &T3T3_eta() { return sdl.T3T3_eta(); } const vector &t3_occupancies() { return sdl.t3_occupancies(); } - const vector > &T3T3_matched_simIdx() { return sdl.T3T3_matched_simIdx(); } const vector &t5_foundDuplicate() { return sdl.t5_foundDuplicate(); } const vector > &sim_pT4_types() { return sdl.sim_pT4_types(); } - const vector &T3T3_matched_pt() { return sdl.T3T3_matched_pt(); } const vector &t4_isFake() { return sdl.t4_isFake(); } const vector &simvtx_x() { return sdl.simvtx_x(); } const vector &simvtx_y() { return sdl.simvtx_y(); } @@ -3298,13 +2884,11 @@ namespace tas { const vector &tc_pt() { return sdl.tc_pt(); } const vector &pT3_phi_2() { return sdl.pT3_phi_2(); } const vector &pT5_pt() { return sdl.pT5_pt(); } - const vector &T3T3_isFake() { return sdl.T3T3_isFake(); } const vector &pureTCE_rPhiChiSquared() { return sdl.pureTCE_rPhiChiSquared(); } const vector &pT5_score() { return sdl.pT5_score(); } const vector &sim_phi() { return sdl.sim_phi(); } const vector &pT5_isFake() { return sdl.pT5_isFake(); } const vector &tc_maxHitMatchedCounts() { return sdl.tc_maxHitMatchedCounts(); } - const vector &T3T3_phi() { return sdl.T3T3_phi(); } const vector > &pureTCE_nLayerOverlaps() { return sdl.pureTCE_nLayerOverlaps(); } const vector &sim_pca_dz() { return sdl.sim_pca_dz(); } const vector > &pureTCE_hitIdxs() { return sdl.pureTCE_hitIdxs(); } @@ -3315,7 +2899,6 @@ namespace tas { const vector &pLS_score() { return sdl.pLS_score(); } const vector &pT3_phi() { return sdl.pT3_phi(); } const vector &pT5_eta() { return sdl.pT5_eta(); } - const vector &T3T3_innerT3Radius() { return sdl.T3T3_innerT3Radius(); } const vector &tc_phi() { return sdl.tc_phi(); } const vector &t4_eta() { return sdl.t4_eta(); } const vector &pLS_isFake() { return sdl.pLS_isFake(); } @@ -3326,7 +2909,6 @@ namespace tas { const vector &sim_parentVtxIdx() { return sdl.sim_parentVtxIdx(); } const vector &pureTCE_layer_binary() { return sdl.pureTCE_layer_binary(); } const vector &sim_pT4_matched() { return sdl.sim_pT4_matched(); } - const vector &T3T3_rPhiChiSquared() { return sdl.T3T3_rPhiChiSquared(); } const vector &tc_eta() { return sdl.tc_eta(); } const vector &sim_lengap() { return sdl.sim_lengap(); } const vector &sim_T5_matched() { return sdl.sim_T5_matched(); } @@ -3342,7 +2924,6 @@ namespace tas { const vector &pLS_isDuplicate() { return sdl.pLS_isDuplicate(); } const vector &tce_anchorIndex() { return sdl.tce_anchorIndex(); } const vector &t5_occupancies() { return sdl.t5_occupancies(); } - const vector &T3T3_outerT3Radius() { return sdl.T3T3_outerT3Radius(); } const vector &tc_type() { return sdl.tc_type(); } const vector &tce_isFake() { return sdl.tce_isFake(); } const vector &pLS_pt() { return sdl.pLS_pt(); } @@ -3350,7 +2931,6 @@ namespace tas { const vector > &sim_T4_types() { return sdl.sim_T4_types(); } const vector &pT4_isDuplicate() { return sdl.pT4_isDuplicate(); } const vector &t4_pt() { return sdl.t4_pt(); } - const vector > &T3T3_nHitOverlaps() { return sdl.T3T3_nHitOverlaps(); } const vector > &sim_TC_types() { return sdl.sim_TC_types(); } const vector &sg_occupancies() { return sdl.sg_occupancies(); } const vector &pT4_pt() { return sdl.pT4_pt(); } diff --git a/efficiency/src/SDL.h b/efficiency/src/SDL.h index 3747e1d13..99225aa07 100644 --- a/efficiency/src/SDL.h +++ b/efficiency/src/SDL.h @@ -44,15 +44,9 @@ class SDL { vector *sim_eta_; TBranch *sim_eta_branch; bool sim_eta_isLoaded; - vector *T3T3_layer_binary_; - TBranch *T3T3_layer_binary_branch; - bool T3T3_layer_binary_isLoaded; vector *pT3_foundDuplicate_; TBranch *pT3_foundDuplicate_branch; bool pT3_foundDuplicate_isLoaded; - vector *sim_T3T3_matched_; - TBranch *sim_T3T3_matched_branch; - bool sim_T3T3_matched_isLoaded; vector *sim_len_; TBranch *sim_len_branch; bool sim_len_isLoaded; @@ -68,9 +62,6 @@ class SDL { vector *sim_denom_; TBranch *sim_denom_branch; bool sim_denom_isLoaded; - vector *T3T3_anchorIndex_; - TBranch *T3T3_anchorIndex_branch; - bool T3T3_anchorIndex_isLoaded; vector *pT5_isDuplicate_; TBranch *pT5_isDuplicate_branch; bool pT5_isDuplicate_isLoaded; @@ -92,9 +83,6 @@ class SDL { vector *pureTCE_rzChiSquared_; TBranch *pureTCE_rzChiSquared_branch; bool pureTCE_rzChiSquared_isLoaded; - vector *T3T3_regressionRadius_; - TBranch *T3T3_regressionRadius_branch; - bool T3T3_regressionRadius_isLoaded; vector *t4_isDuplicate_; TBranch *t4_isDuplicate_branch; bool t4_isDuplicate_isLoaded; @@ -116,18 +104,6 @@ class SDL { vector *t5_eta_2_; TBranch *t5_eta_2_branch; bool t5_eta_2_isLoaded; - vector *T3T3_pt_; - TBranch *T3T3_pt_branch; - bool T3T3_pt_isLoaded; - vector *T3T3_maxHitMatchedCounts_; - TBranch *T3T3_maxHitMatchedCounts_branch; - bool T3T3_maxHitMatchedCounts_isLoaded; - vector *T3T3_anchorType_; - TBranch *T3T3_anchorType_branch; - bool T3T3_anchorType_isLoaded; - vector > *T3T3_nLayerOverlaps_; - TBranch *T3T3_nLayerOverlaps_branch; - bool T3T3_nLayerOverlaps_isLoaded; vector *pLS_eta_; TBranch *pLS_eta_branch; bool pLS_eta_isLoaded; @@ -140,9 +116,6 @@ class SDL { vector *tce_layer_binary_; TBranch *tce_layer_binary_branch; bool tce_layer_binary_isLoaded; - vector > *sim_T3T3_types_; - TBranch *sim_T3T3_types_branch; - bool sim_T3T3_types_isLoaded; vector *sim_TC_matched_nonextended_; TBranch *sim_TC_matched_nonextended_branch; bool sim_TC_matched_nonextended_isLoaded; @@ -152,9 +125,6 @@ class SDL { vector *tce_eta_; TBranch *tce_eta_branch; bool tce_eta_isLoaded; - vector *T3T3_rzChiSquared_; - TBranch *T3T3_rzChiSquared_branch; - bool T3T3_rzChiSquared_isLoaded; vector *tce_isDuplicate_; TBranch *tce_isDuplicate_branch; bool tce_isDuplicate_isLoaded; @@ -203,9 +173,6 @@ class SDL { vector > *sim_pureTCE_types_; TBranch *sim_pureTCE_types_branch; bool sim_pureTCE_types_isLoaded; - vector > *T3T3_hitIdxs_; - TBranch *T3T3_hitIdxs_branch; - bool T3T3_hitIdxs_isLoaded; vector *t4_phi_; TBranch *t4_phi_branch; bool t4_phi_isLoaded; @@ -245,9 +212,6 @@ class SDL { vector *sim_pca_dxy_; TBranch *sim_pca_dxy_branch; bool sim_pca_dxy_isLoaded; - vector *T3T3_isDuplicate_; - TBranch *T3T3_isDuplicate_branch; - bool T3T3_isDuplicate_isLoaded; vector *pT4_phi_; TBranch *pT4_phi_branch; bool pT4_phi_isLoaded; @@ -260,24 +224,15 @@ class SDL { vector *sim_pureTCE_matched_; TBranch *sim_pureTCE_matched_branch; bool sim_pureTCE_matched_isLoaded; - vector *T3T3_eta_; - TBranch *T3T3_eta_branch; - bool T3T3_eta_isLoaded; vector *t3_occupancies_; TBranch *t3_occupancies_branch; bool t3_occupancies_isLoaded; - vector > *T3T3_matched_simIdx_; - TBranch *T3T3_matched_simIdx_branch; - bool T3T3_matched_simIdx_isLoaded; vector *t5_foundDuplicate_; TBranch *t5_foundDuplicate_branch; bool t5_foundDuplicate_isLoaded; vector > *sim_pT4_types_; TBranch *sim_pT4_types_branch; bool sim_pT4_types_isLoaded; - vector *T3T3_matched_pt_; - TBranch *T3T3_matched_pt_branch; - bool T3T3_matched_pt_isLoaded; vector *t4_isFake_; TBranch *t4_isFake_branch; bool t4_isFake_isLoaded; @@ -308,9 +263,6 @@ class SDL { vector *pT5_pt_; TBranch *pT5_pt_branch; bool pT5_pt_isLoaded; - vector *T3T3_isFake_; - TBranch *T3T3_isFake_branch; - bool T3T3_isFake_isLoaded; vector *pureTCE_rPhiChiSquared_; TBranch *pureTCE_rPhiChiSquared_branch; bool pureTCE_rPhiChiSquared_isLoaded; @@ -326,9 +278,6 @@ class SDL { vector *tc_maxHitMatchedCounts_; TBranch *tc_maxHitMatchedCounts_branch; bool tc_maxHitMatchedCounts_isLoaded; - vector *T3T3_phi_; - TBranch *T3T3_phi_branch; - bool T3T3_phi_isLoaded; vector > *pureTCE_nLayerOverlaps_; TBranch *pureTCE_nLayerOverlaps_branch; bool pureTCE_nLayerOverlaps_isLoaded; @@ -359,9 +308,6 @@ class SDL { vector *pT5_eta_; TBranch *pT5_eta_branch; bool pT5_eta_isLoaded; - vector *T3T3_innerT3Radius_; - TBranch *T3T3_innerT3Radius_branch; - bool T3T3_innerT3Radius_isLoaded; vector *tc_phi_; TBranch *tc_phi_branch; bool tc_phi_isLoaded; @@ -392,9 +338,6 @@ class SDL { vector *sim_pT4_matched_; TBranch *sim_pT4_matched_branch; bool sim_pT4_matched_isLoaded; - vector *T3T3_rPhiChiSquared_; - TBranch *T3T3_rPhiChiSquared_branch; - bool T3T3_rPhiChiSquared_isLoaded; vector *tc_eta_; TBranch *tc_eta_branch; bool tc_eta_isLoaded; @@ -440,9 +383,6 @@ class SDL { vector *t5_occupancies_; TBranch *t5_occupancies_branch; bool t5_occupancies_isLoaded; - vector *T3T3_outerT3Radius_; - TBranch *T3T3_outerT3Radius_branch; - bool T3T3_outerT3Radius_isLoaded; vector *tc_type_; TBranch *tc_type_branch; bool tc_type_isLoaded; @@ -464,9 +404,6 @@ class SDL { vector *t4_pt_; TBranch *t4_pt_branch; bool t4_pt_isLoaded; - vector > *T3T3_nHitOverlaps_; - TBranch *T3T3_nHitOverlaps_branch; - bool T3T3_nHitOverlaps_isLoaded; vector > *sim_TC_types_; TBranch *sim_TC_types_branch; bool sim_TC_types_isLoaded; @@ -533,15 +470,12 @@ class SDL { const vector &sim_event(); const vector &sim_q(); const vector &sim_eta(); - const vector &T3T3_layer_binary(); const vector &pT3_foundDuplicate(); - const vector &sim_T3T3_matched(); const vector &sim_len(); const vector &pureTCE_isDuplicate(); const vector &pT3_score(); const vector &t5_eta(); const vector &sim_denom(); - const vector &T3T3_anchorIndex(); const vector &pT5_isDuplicate(); const vector &sim_tce_matched(); const vector &pT3_isDuplicate(); @@ -549,7 +483,6 @@ class SDL { const vector &pT3_eta_2(); const vector &sim_pT3_matched(); const vector &pureTCE_rzChiSquared(); - const vector &T3T3_regressionRadius(); const vector &t4_isDuplicate(); const vector &pureTCE_eta(); const vector &tce_rPhiChiSquared(); @@ -557,19 +490,13 @@ class SDL { const vector &pureTCE_pt(); const vector &sim_pt(); const vector &t5_eta_2(); - const vector &T3T3_pt(); - const vector &T3T3_maxHitMatchedCounts(); - const vector &T3T3_anchorType(); - const vector > &T3T3_nLayerOverlaps(); const vector &pLS_eta(); const vector &sim_pdgId(); const vector &t3_eta(); const vector &tce_layer_binary(); - const vector > &sim_T3T3_types(); const vector &sim_TC_matched_nonextended(); const vector &t4_occupancies(); const vector &tce_eta(); - const vector &T3T3_rzChiSquared(); const vector &tce_isDuplicate(); const vector > &pT5_matched_simIdx(); const vector > &sim_tcIdx(); @@ -586,7 +513,6 @@ class SDL { const vector > &t5_hitIdxs(); const vector > &sim_pT3_types(); const vector > &sim_pureTCE_types(); - const vector > &T3T3_hitIdxs(); const vector &t4_phi(); const vector &t5_phi(); const vector > &pT5_hitIdxs(); @@ -600,17 +526,13 @@ class SDL { const vector &tc_sim(); const vector > &sim_pLS_types(); const vector &sim_pca_dxy(); - const vector &T3T3_isDuplicate(); const vector &pT4_phi(); const vector &sim_hits(); const vector &pLS_phi(); const vector &sim_pureTCE_matched(); - const vector &T3T3_eta(); const vector &t3_occupancies(); - const vector > &T3T3_matched_simIdx(); const vector &t5_foundDuplicate(); const vector > &sim_pT4_types(); - const vector &T3T3_matched_pt(); const vector &t4_isFake(); const vector &simvtx_x(); const vector &simvtx_y(); @@ -621,13 +543,11 @@ class SDL { const vector &tc_pt(); const vector &pT3_phi_2(); const vector &pT5_pt(); - const vector &T3T3_isFake(); const vector &pureTCE_rPhiChiSquared(); const vector &pT5_score(); const vector &sim_phi(); const vector &pT5_isFake(); const vector &tc_maxHitMatchedCounts(); - const vector &T3T3_phi(); const vector > &pureTCE_nLayerOverlaps(); const vector &sim_pca_dz(); const vector > &pureTCE_hitIdxs(); @@ -638,7 +558,6 @@ class SDL { const vector &pLS_score(); const vector &pT3_phi(); const vector &pT5_eta(); - const vector &T3T3_innerT3Radius(); const vector &tc_phi(); const vector &t4_eta(); const vector &pLS_isFake(); @@ -649,7 +568,6 @@ class SDL { const vector &sim_parentVtxIdx(); const vector &pureTCE_layer_binary(); const vector &sim_pT4_matched(); - const vector &T3T3_rPhiChiSquared(); const vector &tc_eta(); const vector &sim_lengap(); const vector &sim_T5_matched(); @@ -665,7 +583,6 @@ class SDL { const vector &pLS_isDuplicate(); const vector &tce_anchorIndex(); const vector &t5_occupancies(); - const vector &T3T3_outerT3Radius(); const vector &tc_type(); const vector &tce_isFake(); const vector &pLS_pt(); @@ -673,7 +590,6 @@ class SDL { const vector > &sim_T4_types(); const vector &pT4_isDuplicate(); const vector &t4_pt(); - const vector > &T3T3_nHitOverlaps(); const vector > &sim_TC_types(); const vector &sg_occupancies(); const vector &pT4_pt(); @@ -709,15 +625,12 @@ namespace tas { const vector &sim_event(); const vector &sim_q(); const vector &sim_eta(); - const vector &T3T3_layer_binary(); const vector &pT3_foundDuplicate(); - const vector &sim_T3T3_matched(); const vector &sim_len(); const vector &pureTCE_isDuplicate(); const vector &pT3_score(); const vector &t5_eta(); const vector &sim_denom(); - const vector &T3T3_anchorIndex(); const vector &pT5_isDuplicate(); const vector &sim_tce_matched(); const vector &pT3_isDuplicate(); @@ -725,7 +638,6 @@ namespace tas { const vector &pT3_eta_2(); const vector &sim_pT3_matched(); const vector &pureTCE_rzChiSquared(); - const vector &T3T3_regressionRadius(); const vector &t4_isDuplicate(); const vector &pureTCE_eta(); const vector &tce_rPhiChiSquared(); @@ -733,19 +645,13 @@ namespace tas { const vector &pureTCE_pt(); const vector &sim_pt(); const vector &t5_eta_2(); - const vector &T3T3_pt(); - const vector &T3T3_maxHitMatchedCounts(); - const vector &T3T3_anchorType(); - const vector > &T3T3_nLayerOverlaps(); const vector &pLS_eta(); const vector &sim_pdgId(); const vector &t3_eta(); const vector &tce_layer_binary(); - const vector > &sim_T3T3_types(); const vector &sim_TC_matched_nonextended(); const vector &t4_occupancies(); const vector &tce_eta(); - const vector &T3T3_rzChiSquared(); const vector &tce_isDuplicate(); const vector > &pT5_matched_simIdx(); const vector > &sim_tcIdx(); @@ -762,7 +668,6 @@ namespace tas { const vector > &t5_hitIdxs(); const vector > &sim_pT3_types(); const vector > &sim_pureTCE_types(); - const vector > &T3T3_hitIdxs(); const vector &t4_phi(); const vector &t5_phi(); const vector > &pT5_hitIdxs(); @@ -776,17 +681,13 @@ namespace tas { const vector &tc_sim(); const vector > &sim_pLS_types(); const vector &sim_pca_dxy(); - const vector &T3T3_isDuplicate(); const vector &pT4_phi(); const vector &sim_hits(); const vector &pLS_phi(); const vector &sim_pureTCE_matched(); - const vector &T3T3_eta(); const vector &t3_occupancies(); - const vector > &T3T3_matched_simIdx(); const vector &t5_foundDuplicate(); const vector > &sim_pT4_types(); - const vector &T3T3_matched_pt(); const vector &t4_isFake(); const vector &simvtx_x(); const vector &simvtx_y(); @@ -797,13 +698,11 @@ namespace tas { const vector &tc_pt(); const vector &pT3_phi_2(); const vector &pT5_pt(); - const vector &T3T3_isFake(); const vector &pureTCE_rPhiChiSquared(); const vector &pT5_score(); const vector &sim_phi(); const vector &pT5_isFake(); const vector &tc_maxHitMatchedCounts(); - const vector &T3T3_phi(); const vector > &pureTCE_nLayerOverlaps(); const vector &sim_pca_dz(); const vector > &pureTCE_hitIdxs(); @@ -814,7 +713,6 @@ namespace tas { const vector &pLS_score(); const vector &pT3_phi(); const vector &pT5_eta(); - const vector &T3T3_innerT3Radius(); const vector &tc_phi(); const vector &t4_eta(); const vector &pLS_isFake(); @@ -825,7 +723,6 @@ namespace tas { const vector &sim_parentVtxIdx(); const vector &pureTCE_layer_binary(); const vector &sim_pT4_matched(); - const vector &T3T3_rPhiChiSquared(); const vector &tc_eta(); const vector &sim_lengap(); const vector &sim_T5_matched(); @@ -841,7 +738,6 @@ namespace tas { const vector &pLS_isDuplicate(); const vector &tce_anchorIndex(); const vector &t5_occupancies(); - const vector &T3T3_outerT3Radius(); const vector &tc_type(); const vector &tce_isFake(); const vector &pLS_pt(); @@ -849,7 +745,6 @@ namespace tas { const vector > &sim_T4_types(); const vector &pT4_isDuplicate(); const vector &t4_pt(); - const vector > &T3T3_nHitOverlaps(); const vector > &sim_TC_types(); const vector &sg_occupancies(); const vector &pT4_pt(); diff --git a/efficiency/src/efficiency.cc b/efficiency/src/efficiency.cc index ccb294ed0..a2d84569f 100644 --- a/efficiency/src/efficiency.cc +++ b/efficiency/src/efficiency.cc @@ -36,9 +36,6 @@ int main(int argc, char** argv) list_effSetDef.push_back(EfficiencySetDefinition("pT5_AllTypes", 13, [&](int isim) {return static_cast(sdl.sim_pT5_matched().size()) > isim ? sdl.sim_pT5_matched()[isim] > 0 : false;})); list_effSetDef.push_back(EfficiencySetDefinition("TCE_AllTypes", 13, [&](int isim) {return static_cast(sdl.sim_tce_matched().size()) > isim ? sdl.sim_tce_matched()[isim] > 0 : false;})); list_effSetDef.push_back(EfficiencySetDefinition("pureTCE_AllTypes", 13, [&](int isim) {return static_cast(sdl.sim_pureTCE_matched().size()) > isim ? sdl.sim_pureTCE_matched()[isim] > 0 : false;})); -#ifdef T3T3_EXTENSIONS - list_effSetDef.push_back(EfficiencySetDefinition("T3T3_AllTypes", 13, [&](int isim) {return static_cast(sdl.sim_T3T3_matched().size()) > isim ? sdl.sim_T3T3_matched()[isim] > 0 : false;})); -#endif } bookEfficiencySets(list_effSetDef); @@ -59,9 +56,6 @@ int main(int argc, char** argv) list_FRSetDef.push_back(FakeRateSetDefinition("pT5_AllTypes", 13, [&](int ipT5) {return static_cast(sdl.pT5_isFake().size()) > ipT5 ? sdl.pT5_isFake()[ipT5] > 0 : false;}, sdl.pT5_pt(), sdl.pT5_eta(), sdl.pT5_phi())); list_FRSetDef.push_back(FakeRateSetDefinition("TCE_AllTypes", 13, [&](int iTCE) {return static_cast(sdl.tce_isFake().size()) > iTCE ? sdl.tce_isFake()[iTCE] > 0 : false;}, sdl.tce_pt(), sdl.tce_eta(), sdl.tce_phi())); list_FRSetDef.push_back(FakeRateSetDefinition("pureTCE_AllTypes", 13, [&](int ipureTCE) {return static_cast(sdl.tce_isFake().size()) > ipureTCE ? sdl.tce_isFake()[ipureTCE] > 0 : false;}, sdl.pureTCE_pt(), sdl.pureTCE_eta(), sdl.pureTCE_phi())); -#ifdef T3T3_EXTENSIONS - list_FRSetDef.push_back(FakeRateSetDefinition("T3T3_AllTypes", 13, [&](int iT3T3) {return static_cast(sdl.T3T3_isFake().size()) > iT3T3 ? sdl.T3T3_isFake()[iT3T3] > 0 : false;}, sdl.T3T3_pt(), sdl.T3T3_eta(), sdl.T3T3_phi())); -#endif } bookFakeRateSets(list_FRSetDef); @@ -81,10 +75,6 @@ int main(int argc, char** argv) list_DLSetDef.push_back(DuplicateRateSetDefinition("pT5_AllTypes", 13, [&](int ipT5) {return static_cast(sdl.pT5_isDuplicate().size()) > ipT5 ? sdl.pT5_isDuplicate()[ipT5] > 0 : false;}, sdl.pT5_pt(), sdl.pT5_eta(), sdl.pT5_phi())); list_DLSetDef.push_back(DuplicateRateSetDefinition("TCE_AllTypes", 13, [&](int iTCE) {return static_cast(sdl.tce_isDuplicate().size()) > iTCE ? sdl.tce_isDuplicate()[iTCE] > 0 : false;}, sdl.tce_pt(), sdl.tce_eta(), sdl.tce_phi())); list_DLSetDef.push_back(DuplicateRateSetDefinition("pureTCE_AllTypes", 13, [&](int ipureTCE) {return static_cast(sdl.tce_isDuplicate().size()) > ipureTCE ? sdl.tce_isDuplicate()[ipureTCE] > 0 : false;}, sdl.pureTCE_pt(), sdl.pureTCE_eta(), sdl.pureTCE_phi())); -#ifdef T3T3_EXTENSIONS - list_DLSetDef.push_back(DuplicateRateSetDefinition("T3T3_AllTypes", 13, [&](int iT3T3) {return static_cast(sdl.T3T3_isDuplicate().size()) > iT3T3 ? sdl.T3T3_isDuplicate()[iT3T3] > 0 : false;}, sdl.T3T3_pt(), sdl.T3T3_eta(), sdl.T3T3_phi())); -#endif - } bookDuplicateRateSets(list_DLSetDef);