diff --git a/python/src/enums.cpp b/python/src/enums.cpp index 788b402e0..f8fe239a7 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -75,10 +75,18 @@ void init_enums(py::module &m) { py::enum_(Defs, "fileFormat") .value("BINARY", slsDetectorDefs::fileFormat::BINARY) .value("HDF5", slsDetectorDefs::fileFormat::HDF5) + .value("ROOT", slsDetectorDefs::fileFormat::ROOT) .value("NUM_FILE_FORMATS", slsDetectorDefs::fileFormat::NUM_FILE_FORMATS) .export_values(); + py::enum_(Defs, "rootImageType") + .value("ROOT_TTREE", slsDetectorDefs::rootImageType::ROOT_TTREE) + .value("ROOT_TH2I", slsDetectorDefs::rootImageType::ROOT_TH2I) + .value("NUM_ROOT_IMAGE_TYPES", + slsDetectorDefs::rootImageType::NUM_ROOT_IMAGE_TYPES) + .export_values(); + py::enum_(Defs, "externalSignalFlag") .value("TRIGGER_IN_RISING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_IN_RISING_EDGE) diff --git a/slsDetectorSoftware/generator/extended_commands.yaml b/slsDetectorSoftware/generator/extended_commands.yaml index d4012ec02..29ae400fe 100644 --- a/slsDetectorSoftware/generator/extended_commands.yaml +++ b/slsDetectorSoftware/generator/extended_commands.yaml @@ -3538,8 +3538,9 @@ fformat: store_result_in_t: false command_name: fformat function_alias: fformat - help: "[binary|hdf5]\n\tFile format of data file. For HDF5, package must be compiled\ - \ with HDF5 flags. Default is binary." + help: "[binary|hdf5|root]\n\tFile format of data file. For HDF5, package must be\ + \ compiled with HDF5 flags. For ROOT, package must be compiled with ROOT flags.\ + \ Default is binary." infer_action: true template: true fformatoptions: diff --git a/slsDetectorSoftware/src/Caller.cpp b/slsDetectorSoftware/src/Caller.cpp index c7f6efac9..5d69a3654 100644 --- a/slsDetectorSoftware/src/Caller.cpp +++ b/slsDetectorSoftware/src/Caller.cpp @@ -4063,8 +4063,8 @@ std::string Caller::fformat(int action) { std::ostringstream os; // print help if (action == slsDetectorDefs::HELP_ACTION) { - os << R"V0G0N([binary|hdf5] - File format of data file. For HDF5, package must be compiled with HDF5 flags. Default is binary. )V0G0N" + os << R"V0G0N([binary|hdf5|root] + File format of data file. For HDF5, package must be compiled with HDF5 flags. For ROOT, package must be compiled with ROOT flags. Default is binary. )V0G0N" << std::endl; return os.str(); }