Skip to content
Snippets Groups Projects
Commit 885138ce authored by Patrick Koppenburg's avatar Patrick Koppenburg :leaves:
Browse files

Merge branch 'remove-obsolete-enable_unpack-option' into 'master'

remove mention of obsolete, unnecessary enable_unpack option

See merge request !772
parents 2fc2b443 d2b34d53
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!772remove mention of obsolete, unnecessary enable_unpack option
Pipeline #4632820 passed
Showing
with 53 additions and 74 deletions
......@@ -9,4 +9,3 @@ histo_file: DV_histo_xgen.root
ntuple_file: DV_tuple_xgen.root
input_raw_format: 0.5
process: Hlt2
enable_unpack: false
......@@ -5,4 +5,3 @@ input_type: ROOT
simulation: true
conddb_tag: sim-20171127-vc-md100
dddb_tag: dddb-20171126
enable_unpack: false
\ No newline at end of file
......@@ -19,7 +19,6 @@
</set></argument>
<argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml</text></argument>
<argument name="extra_options_yaml"><text>
enable_unpack: False
evt_max: 10
histo_file: DV-example-tupling-DTF-his.root
input_raw_format: 4.3
......
......@@ -23,7 +23,6 @@
ntuple_file: DV-example-tupling-advanced-ntp.root
histo_file: DV-example-tupling-advanced-his.root
input_raw_format: 4.3
enable_unpack: False
</text></argument>
<argument name="validator"><text>
import sys, os, glob
......
......@@ -19,7 +19,6 @@
</set></argument>
<argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml</text></argument>
<argument name="extra_options_yaml"><text>
enable_unpack: False
evt_max: 10
histo_file: DV-example-tupling-basic-his-run-mc.root
input_raw_format: 4.3
......
......@@ -21,7 +21,6 @@
histo_file: DV-example-tupling-basic-his.root
evt_max: 10
input_raw_format: 4.3
enable_unpack: false
</text></argument>
<argument name="timeout"><integer>3600</integer></argument>
<argument name="args"><set>
......
......@@ -137,15 +137,14 @@ FSROutputStreamDstWriter INFO Events output: 1
Tuple_B0Dspi SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Tuple_B0Dspi SUCCESS List of booked N-Tuples in directory "FILE1/Tuple_B0Dspi"
Tuple_B0Dspi SUCCESS ID=DecayTree Title="DecayTree" #items=25 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
LAZY_AND: DaVinci #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
LAZY_AND: B0Dspi #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#1 #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/Filter_B0Dspi #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
FunTupleBase_Particles/Tuple_B0Dspi #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: DaVinci #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
LAZY_AND: B0Dspi #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
LoKi__HDRFilter/Filter_B0Dspi #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
FunTupleBase_Particles/Tuple_B0Dspi #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%|
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=DV_example_configFuntuple_ntp.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
......
......@@ -21,15 +21,14 @@ FSROutputStreamDstWriter INFO Events output: 1
B0DsK_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0DsK_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=11 {B0_THOR_MASS,indx,B0_TagTr_P[1]/V,nTags,B0_TagTr_PT[1]/V,B0_THOR_P,B0_THOR_PT,Ds_}
LAZY_AND: DaVinci #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
LAZY_AND: default #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#1 #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/HDRFilter_B0DsK #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
FunTupleBase_Particles/B0DsK_Tuple #=75 Sum=75 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: DaVinci #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
LAZY_AND: default #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
LoKi__HDRFilter/HDRFilter_B0DsK #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
FunTupleBase_Particles/B0DsK_Tuple #=75 Sum=75 Eff=|( 100.0000 +- 0.00000 )%|
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=DV-example-tagger-ntp.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
......
......@@ -26,15 +26,14 @@ FSROutputStreamDstWriter INFO Events output: 1
Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Tuple SUCCESS List of booked N-Tuples in directory "FILE1/Tuple"
Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=10 {BUNCHCROSSING_ID,BUNCHCROSSING_TYPE,EVENTNUMBER,GPSTIME,ODINTCK,RUNNUMBER,nFTClus}
LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: FileSummaryRecords #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: default #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/Myfilter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: FileSummaryRecords #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: default #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/Myfilter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=tuple_LbToLcmunu.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
......
......@@ -27,15 +27,14 @@ FSROutputStreamDstWriter INFO Events output: 1
Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Tuple SUCCESS List of booked N-Tuples in directory "FILE1/Tuple"
Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=79 {EVENTNUMBER,Hlt2_TCK,RUNNUMBER,D0_ID,D0_KEY,D0_PT,D0_PX,D0_PY,D0_PZ,D0_ENERGY,D0_}
LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: FileSummaryRecords #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: default #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/HDRFilter_D0Kpi #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: FileSummaryRecords #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: default #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/HDRFilter_D0Kpi #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=tuple_D0_Kpi_10evts_fromHlt2.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
......
......@@ -21,15 +21,14 @@ FSROutputStreamDstWriter INFO Events output: 1
Bs2JpsiPhi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Bs2JpsiPhi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/Bs2JpsiPhi_Tuple"
Bs2JpsiPhi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=21 {Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,Jpsi_M,Jpsi_P,Jpsi_PT,Jpsi_PX,Jpsi_PY}
LAZY_AND: DaVinci #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
NONLAZY_OR: FileSummaryRecords #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
LAZY_AND: Bs2JpsiPhi #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#1 #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/HDRFilter_Bs2JpsiPhi #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
FunTupleBase_Particles/Bs2JpsiPhi_Tuple #=298 Sum=298 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: DaVinci #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
NONLAZY_OR: FileSummaryRecords #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
LAZY_AND: Bs2JpsiPhi #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
LoKi__HDRFilter/HDRFilter_Bs2JpsiPhi #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
FunTupleBase_Particles/Bs2JpsiPhi_Tuple #=298 Sum=298 Eff=|( 100.0000 +- 0.00000 )%|
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=passthrough_tuple.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
......
......@@ -141,21 +141,19 @@ B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree"
B0Dspi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0Dspi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0Dspi_Tuple"
B0Dspi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=27 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
LAZY_AND: DaVinci #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
LAZY_AND: B0DsK #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
LoKi__HDRFilter/Hlt2TopoLineFilter #=118 Sum=72 Eff=|( 61.01695 +- 4.48975 )%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#1 #=72 Sum=72 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/HDRFilter_B0DsK #=72 Sum=48 Eff=|( 66.66667 +- 5.55556 )%|
FunTupleBase_Particles/B0DsK_Tuple #=48 Sum=48 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: B0Dspi #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
LoKi__HDRFilter/Hlt2TopoLineFilter #=118 Sum=72 Eff=|( 61.01695 +- 4.48975 )%|
LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#1 #=72 Sum=72 Eff=|( 100.0000 +- 0.00000 )%|
LoKi__HDRFilter/HDRFilter_B0Dspi #=72 Sum=1 Eff=|( 1.388889 +- 1.37921 )%|
FunTupleBase_Particles/B0Dspi_Tuple #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: DaVinci #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
RecordStream/FSROutputStreamDstWriter #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: UserAnalysis #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
LAZY_AND: B0DsK #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
LoKi__HDRFilter/Hlt2TopoLineFilter #=118 Sum=72 Eff=|( 61.01695 +- 4.48975 )%|
LoKi__HDRFilter/HDRFilter_B0DsK #=72 Sum=48 Eff=|( 66.66667 +- 5.55556 )%|
FunTupleBase_Particles/B0DsK_Tuple #=48 Sum=48 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: B0Dspi #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
LoKi__HDRFilter/Hlt2TopoLineFilter #=118 Sum=72 Eff=|( 61.01695 +- 4.48975 )%|
LoKi__HDRFilter/HDRFilter_B0Dspi #=72 Sum=1 Eff=|( 1.388889 +- 1.37921 )%|
FunTupleBase_Particles/B0Dspi_Tuple #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%|
RFileCnv INFO dumping contents of /NTUPLES/FILE1
TFile: name=DV_example_sprucing_ntp.root, title=Gaudi Trees, option=CREATE
NTupleSvc INFO NTuples saved successfully
......
......@@ -21,7 +21,6 @@
ntuple_file: DV-Ntuple.root
histo_file: DV-Histos.root
lumi: False
enable_unpack: False
process: Turbo
</text></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
......
......@@ -21,7 +21,6 @@
ntuple_file: DV-Ntuple.root
histo_file: DV-Histos.root
lumi: False
enable_unpack: False
process: Turbo
evt_max: 10
</text></argument>
......
......@@ -19,7 +19,6 @@
</set></argument>
<argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml</text></argument>
<argument name="extra_options_yaml"><text>
enable_unpack: False
evt_max: 10
histo_file: DV-example-tupling-DTF-his.root
input_raw_format: 4.3
......
......@@ -22,7 +22,6 @@
ntuple_file: 'DVtest_useralgs_ntp.root'
histo_file: 'DVtest_useralgs_his.root'
evt_max: 10
enable_unpack: False
</text></argument>
<argument name="reference"><text>../refs/test_davinci_user_algs.ref</text></argument>
<argument name="error_reference"><text>../refs/empty.ref</text></argument>
......
......@@ -17,7 +17,6 @@
<argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Upgrade_genFSR_ldst.yaml</text></argument>
<argument name="extra_options_yaml"><text>
merge_genfsr: True
enable_unpack: False
</text></argument>
<argument name="validator"><text>
import xml.etree.ElementTree as ET
......
......@@ -19,7 +19,6 @@
<argument name="test_file_db_options_yaml"><text>upgrade-magdown-sim09c-up02-34112100-digi</text></argument>
<argument name="extra_options_yaml"><text>
evt_max: 200
enable_unpack: false
</text></argument>
<argument name="reference"><text>../refs/test_davinci_read_mc_digi.ref</text></argument>
<argument name="error_reference"><text>../refs/empty.ref</text></argument>
......
......@@ -19,7 +19,6 @@
<argument name="test_file_db_options_yaml"><text>upgrade-magdown-sim09c-up02-reco-up01-minbias-ldst</text></argument>
<argument name="extra_options_yaml"><text>
evt_max: 200
enable_unpack: false
</text></argument>
<argument name="reference"><text>../refs/test_davinci_read_mc_ldst.ref</text></argument>
<argument name="error_reference"><text>../refs/empty.ref</text></argument>
......
......@@ -20,7 +20,6 @@
<argument name="extra_options_yaml"><text>
input_type: RAW
evt_max: 200
enable_unpack: false
</text></argument>
<argument name="reference"><text>../refs/test_davinci_read_mc_mdf.ref</text></argument>
<argument name="error_reference"><text>../refs/empty.ref</text></argument>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment