From f70810f689b155c105f309c626c94c43db36e963 Mon Sep 17 00:00:00 2001 From: rettigl Date: Fri, 18 Oct 2024 00:01:16 +0200 Subject: [PATCH] change config back for tutorial data --- .cspell/custom-dictionary.txt | 1 + tutorial/sxp_config.yaml | 40 +++++++++++++++-------------------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.cspell/custom-dictionary.txt b/.cspell/custom-dictionary.txt index 128efab7..8dbebcb2 100644 --- a/.cspell/custom-dictionary.txt +++ b/.cspell/custom-dictionary.txt @@ -84,6 +84,7 @@ dfpart dfpid dictionarized dictmerge +DOOCS dpkg dropna dset diff --git a/tutorial/sxp_config.yaml b/tutorial/sxp_config.yaml index 2eb6e2de..04071dcb 100644 --- a/tutorial/sxp_config.yaml +++ b/tutorial/sxp_config.yaml @@ -16,8 +16,8 @@ dataframe: ubid_offset: 0 daq: DA03 forward_fill_iterations: 2 - num_trains: 1 - num_pulses: 400 + num_trains: 10 + # num_pulses: 400 # only needed for data from new DAQ x_column: dldPosX corrected_x_column: "X" kx_column: "kx" @@ -52,47 +52,41 @@ dataframe: channels: timeStamp: - daq: "DA03" format: per_train dataset_key: "/INDEX/timestamp" index_key: "/INDEX/trainId" scale: 1000000000 pulseId: - daq: "DA03" format: per_electron - dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/starterCounter" - index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/trainId" + dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/starterCounter" + index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/trainId" max_hits: 10000 trainId: - daq: "DA03" format: per_electron - dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/masterCounter" - index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/trainId" + dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/masterCounter" + index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/trainId" max_hits: 10000 dldPosX: - daq: "DA03" format: per_electron - dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/x" - index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/trainId" + dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/x" + index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/trainId" max_hits: 10000 dldPosY: - daq: "DA03" format: per_electron - dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/y" - index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/trainId" + dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/y" + index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/trainId" max_hits: 10000 dldTimeSteps: - daq: "DA03" format: per_electron - dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/t" - index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_CPP_TEST:daqOutput/daqOutput/trainId" + dataset_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/t" + index_key: "/INSTRUMENT/SXP_TR_XPES/DET/MCP_DETECTOR:output/data/trainId" max_hits: 10000 -# delayStage: -# format: per_train -# dataset_key: "/CONTROL/SCS_ILH_LAS/MDL/OPTICALDELAY_PP800/actualPosition/value" -# index_key: "/INDEX/trainId" + delayStage: + format: per_train + dataset_key: "/CONTROL/SCS_ILH_LAS/MDL/OPTICALDELAY_PP800/actualPosition/value" + index_key: "/INDEX/trainId" test: - daq: DA02 + daq: DA02 # change DAQ for a channel format: per_pulse dataset_key: "/INSTRUMENT/SA3_XTD10_XGM/XGM/DOOCS:output/data/intensitySa3TD" index_key: "/INSTRUMENT/SA3_XTD10_XGM/XGM/DOOCS:output/data/trainId"