updates

BM32ESRF · Dec 10, 2022 · e2fefe8 · e2fefe8
1 parent a7def01
commit e2fefe8
Show file tree

Hide file tree

Showing 3 changed files with 359 additions and 353 deletions.
diff --git a/lauetoolsnn/lauetools/IOimagefile.py b/lauetoolsnn/lauetools/IOimagefile.py
@@ -523,45 +523,43 @@ def readCCDimage(filename, CCDLabel="MARCCD165", dirname=None, stackimageindex=-
         print('PIL_EXISTS',PIL_EXISTS)
     #    if extension != extension:
     #        print "warning : file extension does not match CCD type set in Set CCD File Parameters"
-    if FABIO_EXISTS:
-        if CCDLabel in ('MARCCD165', "EDF", "EIGER_4M", "EIGER_1M",
-                        "sCMOS", "sCMOS_fliplr", "sCMOS_fliplr_16M", "sCMOS_16M",
-                        "Rayonix MX170-HS", 'psl_weiwei', 'ImageStar_dia_2021'):
-
+    if MLAB_EXISTS:
+        try:
             if verbose > 1:
-                print('----> Using fabio ... to open %s\n'%filename)
+                print('----> Using matplotlib ... to open %s\n'%filename)
             # warning import Image  # for well read of header only
 
             if dirname is not None:
-                img = fabio.open(os.path.join(dirname, filename))
+                dataimage = plt.imread(os.path.join(dirname, filename))
             else:
-                img = fabio.open(filename)
-
-            dataimage = img.data
+                dataimage = plt.imread(filename)
             framedim = dataimage.shape
-
             # pythonic way to change immutable tuple...
             initframedim = list(DictLT.dict_CCD[CCDLabel][0])
             initframedim[0] = framedim[0]
             initframedim[1] = framedim[1]
             initframedim = tuple(initframedim)
-        else:
+        except:
+            print("Matplotlib reading failed")
             USE_RAW_METHOD = True
-
-    elif MLAB_EXISTS:
+            
+    elif FABIO_EXISTS:
         if CCDLabel in ('MARCCD165', "EDF", "EIGER_4M", "EIGER_1M",
                         "sCMOS", "sCMOS_fliplr", "sCMOS_fliplr_16M", "sCMOS_16M",
                         "Rayonix MX170-HS", 'psl_weiwei', 'ImageStar_dia_2021'):
 
             if verbose > 1:
-                print('----> Using matplotlib ... to open %s\n'%filename)
+                print('----> Using fabio ... to open %s\n'%filename)
             # warning import Image  # for well read of header only
 
             if dirname is not None:
-                dataimage = plt.imread(os.path.join(dirname, filename))
+                img = fabio.open(os.path.join(dirname, filename))
             else:
-                dataimage = plt.imread(filename)
+                img = fabio.open(filename)
+
+            dataimage = img.data
             framedim = dataimage.shape
+
             # pythonic way to change immutable tuple...
             initframedim = list(DictLT.dict_CCD[CCDLabel][0])
             initframedim[0] = framedim[0]

diff --git a/lauetoolsnn/util_scripts/user_training_dataGeneration.py b/lauetoolsnn/util_scripts/user_training_dataGeneration.py
@@ -27,7 +27,7 @@
 
 def simulatemultimatpatterns(nbUBs, key_material, seed=10, 
                              emin=5, emax=23, detectorparameters=[79.51, 977.9, 931.9, 0.36, 0.44], 
-                             pixelsize=0.0734, dim1=2018, dim2=2016, 
+                             pixelsize=0.0734, dim1=2018, dim2=2016, kf_dir="Z>0",
                              removeharmonics=1):
     """
     Parameters
@@ -85,6 +85,7 @@ def simulatemultimatpatterns(nbUBs, key_material, seed=10,
             s_tth, s_chi, s_miller_ind, \
                 s_posx, s_posy, s_E= LT.SimulateLaue_full_np(grain, emin, emax,
                                                             detectorparameters,
+                                                            kf_direction=kf_dir,
                                                             pixelsize=pixelsize,
                                                             dim=(dim1, dim2),
                                                             detectordiameter=detectordiameter,
@@ -120,7 +121,7 @@ def simulatemultimatpatterns(nbUBs, key_material, seed=10,
 
 def getMMpatterns_(nb, material_, 
                    emin=5, emax=23, detectorparameters=[79.51, 977.9, 931.9, 0.36, 0.44], pixelsize=0.0734, 
-                   dim1=2018, dim2=2016,
+                   dim1=2018, dim2=2016,kf_dir="Z>0",
                    ang_maxx = 45, step = 0.5, 
                    seed = 10, noisy_data=False, remove_peaks=False, user_augmentation=False, 
                    normal_hkl=None, index_hkl=None,
@@ -136,6 +137,7 @@ def getMMpatterns_(nb, material_,
                                                                 detectorparameters=detectorparameters,
                                                                 pixelsize=pixelsize,
                                                                 dim1=dim1, dim2=dim2, 
+                                                                kf_dir=kf_dir,
                                                                 removeharmonics=removeharmonics
                                                                  )
     # =============================================================================
@@ -323,6 +325,7 @@ def getMMpatterns_(nb, material_,
 dim2=2016
 emin=5
 emax=23
+kf_dir="Z>0"
 # =============================================================================
 # Material and simulation definition
 # =============================================================================
@@ -366,7 +369,7 @@ def getMMpatterns_(nb, material_,
 file_identifier = 50 
 
 getMMpatterns_(nb_grains, material_, 
-                emin, emax, detectorparameters, pixelsize, dim1, dim2,
+                emin, emax, detectorparameters, pixelsize, dim1, dim2, kf_dir,
                 maximum_angle_to_search, step_for_binning, 
                 seed = 100,#np.random.randint(1e6), 
                 noisy_data=True, remove_peaks=True, user_augmentation=True,