finished with the preparation for the fit by components

XRStools/XRS_swissknife.py

@@ -2698,7 +2698,7 @@ def superR_getVolume_Esynt(mydata):
     print( " SS SHAPE ", SS.shape)
 
 
-    indexes_custom_energies = list(interpolation_dict.keys())
+    indexes_custom_energies = [k for k in interpolation_dict.keys() if k.isdigit() ]
     indexes_custom_energies = sorted( indexes_custom_energies , key = int)
 
 

nonregressions/volumes/test2/batch_extraction_esynth1.py

@@ -89,7 +89,7 @@ def extract_sample_givenrois(
 
 def  InterpInfo_Esynt( cenom , energy_exp_grid = None,    custom_ene_list =  None):
 
-    info_dict = {}
+    info_dict = {"energy_exp_grid":list(energy_exp_grid), "de_list": list(cenom)}
 
     N_custom = len(custom_ene_list)
     N_data   = len( energy_exp_grid ) 
@@ -198,7 +198,7 @@ def get_reference( roi_path = None, reference_target_file = None ):
         signalfile : {reference_target_file}  # Target file for the signals
     """ .format( roi_path = roi_path,  reference_target_file = reference_target_file ) 
 
-    process_input( inputstring , exploit_slurm_mpi = 1) 
+    process_input( inputstring , exploit_slurm_mpi = 0) 
 
 
 
@@ -240,7 +240,7 @@ def get_volume_Esynt( scalarprods_file = None, interpolation_file = None):
     """.format( scalarprods_file = scalarprods_file ,
                 interpolation_file = interpolation_file
     )     
-    process_input( inputstring,  exploit_slurm_mpi = 1)
+    process_input( inputstring,  exploit_slurm_mpi = 0)
 
     
 def myOrder(tok):
@@ -277,12 +277,12 @@ def reshuffle(   volumefile  = "volumes.h5",   nick = None    ):
 
 cenom = np.array(
                  [  6471.983002,
-                    6470.612314,
                     6471.318152,
+                    6470.612314,
                     6471.217828,
                  ])
 
-Enominal = 6470.0
+Enominal = 6470.6
 
 
 cenom -= Enominal
@@ -327,7 +327,7 @@ reference_file = reference_target_file
 
 
     
-if(0): # SAMPLE extraction
+if(1): # SAMPLE extraction
     extract_sample_givenrois(
         roi_path              = roi_path               ,
         data_path_template    = data_path_template     ,
@@ -344,14 +344,14 @@ signals_file = signals_target_file
 
 interpolation_infos_file = "interpolation_infos.json"
 
-if(0):    # INTERPOLATION  ESYNTH
+if(1):    # INTERPOLATION  ESYNTH
     
     info_dict = InterpInfo_Esynt(  cenom , energy_exp_grid = energy_exp_grid,    custom_ene_list =  energy_custom_grid      )
     json.dump(info_dict,open( interpolation_infos_file,"w"), indent=4)
 
 
     
-if(0):
+if(1):
     os.system("rm %s"%scalarprods_target_file)
     for iE in range(Edim) :
         get_scalars(  iE = iE,
@@ -365,7 +365,7 @@ scalarprods_file = scalarprods_target_file
 
         
 # ### ESYNTH
-if(1):
+if(0):
     get_volume_Esynt( scalarprods_file = scalarprods_file,
                       interpolation_file = interpolation_infos_file)