Merge remote-tracking branch 'origin/master'

oda_integral_wrapper/wrapper.py

@@ -112,7 +112,7 @@ class INTEGRALwrapper(object):
                 _disp = disp_by_call[ys]
                 data = data_by_call.get(ys, None)
 
-                self.__log.debug('\n\n\nn_call ', n_call, '\nData ', data,  '\nIs failed ', _disp.is_failed)
+                self.__log.debug(f'\n\n\nn_call {n_call}\nData {data}\nIs failed { _disp.is_failed}')
                 if data is None and not _disp.is_failed:
                     revs = get_revs(scw_list)
                     # Force 0SA10.2 for ISGRI before rev. 1626
@@ -125,7 +125,7 @@ class INTEGRALwrapper(object):
                         local_arguments['osa_version'] = arguments['osa_version']
 
                     scw_list_str = ",".join([s for s in sorted(set(scw_list))])
-                    self.__log.debug("Is submitted", _disp.is_submitted)
+                    self.__log.debug(f"Is submitted: {_disp.is_submitted}")
                     if not _disp.is_submitted:
                         data = _disp.get_product(scw_list=scw_list_str, **local_arguments)
                     else:
@@ -138,10 +138,10 @@ class INTEGRALwrapper(object):
                     else:
                         data_by_call[ys] = _disp.get_product(scw_list=scw_list_str, **local_arguments)
 
-            self.__log.debug('n_poll ', n_poll)
+            self.__log.debug(f'n_poll: {n_poll} ')
             n_complete = len([call for call, _disp in disp_by_call.items() if _disp.is_complete])
-            self.__log.debug('n_complete ', n_complete)
-            self.__log.debug(f"complete {n_complete} / {len(disp_by_call)}")
+            self.__log.debug(f'n_complete: {n_complete}')
+            self.__log.debug(f"complete {float(n_complete) / len(disp_by_call)}")
             if n_complete == len(disp_by_call):
                 self.__log.info("done!")
                 break
@@ -158,7 +158,7 @@ class INTEGRALwrapper(object):
             self.__log.debug(kk)
             self.all_data.append(data_by_call[kk])
 
-        self.__log.debug(len(total_scw_list), tot_num)
+        self.__log.debug(f'{len(total_scw_list)}, {tot_num}')
 
         if 'spectrum' in self.product:
             return self.sum_spectra()
@@ -581,7 +581,9 @@ class INTEGRALwrapper(object):
         if not include_new_sources:
             ind = [not 'NEW' in ss for ss in sources['src_names']]
             clean_sources = sources[ind]
-            INTEGRALwrapper.__log.debug(ind, sources, clean_sources)
+            INTEGRALwrapper.__log.debug(ind)
+            INTEGRALwrapper.__log.debug(sources)
+            INTEGRALwrapper.__log.debug(clean_sources)
         else:
             clean_sources = sources
 
@@ -1064,7 +1066,7 @@ class INTEGRALwrapper(object):
             else:
                 raise Exception("fail")
 
-            INTEGRALwrapper.__log.debug("object:", ooi, c)
+            INTEGRALwrapper.__log.debug(f"object: {ooi} , {c}")
 
             plt.scatter(c.ra.deg, c.dec.deg, marker="o", facecolors='none', s=100,
                         edgecolors='green',