Support providing trimming energies
Build Packages / Unit tests (push) Failing after 3m46s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 4m53s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 5m29s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 5m55s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 6m31s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 7m52s
Build Packages / build:rpm (rocky8) (push) Failing after 8m11s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 8m25s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 1m1s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky9) (push) Failing after 7m46s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 8m19s
Build Packages / XDS test (durin plugin) (push) Successful in 6m57s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 9m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m32s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m32s
Build Packages / DIALS test (push) Successful in 10m46s
Build Packages / Unit tests (push) Failing after 3m46s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 4m53s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 5m29s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 5m55s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 6m31s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 7m52s
Build Packages / build:rpm (rocky8) (push) Failing after 8m11s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 8m25s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 1m1s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky9) (push) Failing after 7m46s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 8m19s
Build Packages / XDS test (durin plugin) (push) Successful in 6m57s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 9m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m32s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m32s
Build Packages / DIALS test (push) Successful in 10m46s
This commit is contained in:
@@ -145,10 +145,11 @@ void SLSDetectorWrapper::Initialize(DiffractionExperiment& experiment,
|
||||
auto trim_directory = experiment.GetDetectorSetup().GetTrimFileDirectory();
|
||||
if (!trim_directory.empty()) {
|
||||
// Hardcoded for now - need to make it nicer
|
||||
std::vector<int> trim_en = {4500, 5400, 6400, 8000, 9900, 15800};
|
||||
std::vector<int> trim_en = experiment.GetDetectorSetup().GetTrimEnergies_eV();
|
||||
if (trim_en.empty())
|
||||
throw JFJochException(JFJochExceptionCategory::Detector, "Trimming energies not provided");
|
||||
det.setTrimEnergies(trim_en);
|
||||
det.setSettingsPath(trim_directory);
|
||||
|
||||
}
|
||||
auto trim_files = experiment.GetDetectorSetup().GetTrimFileNames();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user