merge fix from before
All checks were successful
Build on RHEL9 / build (push) Successful in 2m54s
Build on RHEL8 / build (push) Successful in 2m55s

This commit is contained in:
2025-06-11 16:01:47 +02:00
parent cc57cc7c27
commit bceefe6d64

View File

@ -7,11 +7,7 @@ namespace aare {
/**
* @brief RAII File class for reading, and in the future potentially writing
* image files in various formats. Minimal generic interface. For specail
<<<<<<< HEAD
* fuctions plase use the RawFile, NumpyFile or Hdf5File classes directly. Wraps
=======
* fuctions plase use the RawFile or NumpyFile classes directly. Wraps
>>>>>>> main
* FileInterface to abstract the underlying file format
* @note **frame_number** refers the the frame number sent by the detector while
* **frame_index** is the position of the frame in the file