diff --git a/.gitea/workflows/rh8-local.yml b/.gitea/workflows/rh8-local.yml index b129e2768..128d3176c 100644 --- a/.gitea/workflows/rh8-local.yml +++ b/.gitea/workflows/rh8-local.yml @@ -23,8 +23,6 @@ jobs: conda activate det cmake .. -DSLS_USE_PYTHON=ON make -j 2 - cd ../pyctbgui - make - name: Deploy to NFS update server if: gitea.ref == 'refs/heads/developer' diff --git a/.gitea/workflows/rh9-local.yml b/.gitea/workflows/rh9-local.yml index 817fa11af..58de1cb88 100644 --- a/.gitea/workflows/rh9-local.yml +++ b/.gitea/workflows/rh9-local.yml @@ -20,8 +20,6 @@ jobs: mkdir build && cd build cmake -DSLS_USE_PYTHON=ON -DPython_EXECUTABLE=/usr/bin/python3.13 -DPython_INCLUDE_DIR=/usr/include/python3.13 -DPython_LIBRARY=/usr/lib64/libpython3.13.so .. make -j 2 - cd ../pyctbgui - make - name: Deploy to NFS update server if: gitea.ref == 'refs/heads/developer' diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 2bcda6f53..2692e11e1 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 1685b94fa..9cee22119 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1450,12 +1450,6 @@ int validateVchip(int val, char *mess) { LOG(logERROR, (mess)); return FAIL; } - if (vLimit > 0 && val > vLimit) { - sprintf(mess, "Invalid vchip value %d mV. Exceeds vLimit %d mV\n", val, - vLimit); - LOG(logERROR, (mess)); - return FAIL; - } return OK; } diff --git a/slsReceiverSoftware/src/MasterFileUtility.cpp b/slsReceiverSoftware/src/MasterFileUtility.cpp index ffead18a9..88d5fd299 100644 --- a/slsReceiverSoftware/src/MasterFileUtility.cpp +++ b/slsReceiverSoftware/src/MasterFileUtility.cpp @@ -121,7 +121,7 @@ std::string CreateMasterHDF5File(const std::filesystem::path &filePath, std::mutex *hdf5LibMutex) { std::filesystem::path p = filePath / (fileNamePrefix + "_master_" + - std::to_string(fileIndex) + ".json"); + std::to_string(fileIndex) + ".h5"); std::string fileName = p.string(); std::lock_guard lock(*hdf5LibMutex);