search

PaNOSC-ViNYL / SimEx

Start-to-end photon experiment simulation platform
https://simex.readthedocs.io/
GNU General Public License v3.0
26 stars 25 forks source link

Gapd #181

Closed CFGrote closed 4 years ago

CFGrote commented 4 years ago

@ejcjason , can you fix these conflicts. I cannot get the Ci pass without this.

JunCEEE commented 4 years ago

Yes, I will check that.

JunCEEE commented 4 years ago

@CFGrote I can fix the conflicts. There is a decision to make before merging: for xrayDB, do we use https://github.com/xraypy/XrayDB/archive/4.2.zip in this PR fix or use the xraydb module added to requirements.txt in your recent commit?

PS: the hdf5 data for testing likely needs to be cleaned up, data like prop_out_0000001.h5 cannot be read by h5ls and h5dump tested with h5py2.10

CFGrote commented 4 years ago

I just realize that some commits of this PR are already in #179. Let's finish that one first and then see about the remainders here.