Skip to content

Commit

Permalink
STY: fix style of new files with black/pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
mrakitin committed May 2, 2024
1 parent 01350b2 commit a4a2264
Showing 1 changed file with 44 additions and 31 deletions.
75 changes: 44 additions & 31 deletions chx_packages_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@
import pickle as cpk

import historydict
from eiger_io.fs_handler import EigerImages
from skimage.draw import line, line_aa, polygon

# changes to current version of chx_packages.py
# added load_dask_data in generic_functions


#from pyCHX.chx_handlers import use_dask, use_pims
# from pyCHX.chx_handlers import use_dask, use_pims
from chx_handlers import use_dask, use_pims

# from pyCHX.chx_libs import (
from chx_libs import (
EigerHandler,
Expand All @@ -36,6 +31,12 @@
utils,
warnings,
)
from eiger_io.fs_handler import EigerImages
from skimage.draw import line, line_aa, polygon

# changes to current version of chx_packages.py
# added load_dask_data in generic_functions


use_pims(db) # use pims for importing eiger data, register_handler 'AD_EIGER2' and 'AD_EIGER'

Expand All @@ -48,6 +49,7 @@
para_segment_compress_eigerdata,
segment_compress_eigerdata,
)

# from pyCHX.chx_compress_analysis import (
from chx_compress_analysis import (
Multifile,
Expand All @@ -63,15 +65,20 @@
plot_waterfallc,
read_compressed_eigerdata,
)

# from pyCHX.chx_correlationc import Get_Pixel_Arrayc, auto_two_Arrayc, cal_g2c, get_pixelist_interp_iq
from chx_correlationc import Get_Pixel_Arrayc, auto_two_Arrayc, cal_g2c, get_pixelist_interp_iq

# from pyCHX.chx_correlationp import _one_time_process_errorp, auto_two_Arrayp, cal_g2p, cal_GPF, get_g2_from_ROI_GPF
from chx_correlationp import _one_time_process_errorp, auto_two_Arrayp, cal_g2p, cal_GPF, get_g2_from_ROI_GPF

# from pyCHX.chx_crosscor import CrossCorrelator2, run_para_ccorr_sym
from chx_crosscor import CrossCorrelator2, run_para_ccorr_sym
#from pyCHX.chx_generic_functions import (

# from pyCHX.chx_generic_functions import (
from chx_generic_functions import (
R_2,
RemoveHot,
apply_mask,
average_array_withNan,
check_bad_uids,
Expand Down Expand Up @@ -160,7 +167,6 @@
psave_obj,
read_dict_csv,
refine_roi_mask,
RemoveHot,
reverse_updown,
ring_edges,
run_time,
Expand All @@ -182,8 +188,13 @@
update_roi_mask,
validate_uid,
)

# from pyCHX.chx_olog import Attachment, LogEntry, update_olog_id, update_olog_uid, update_olog_uid_with_file
from chx_olog import Attachment, LogEntry, update_olog_id, update_olog_uid, update_olog_uid_with_file

# from pyCHX.chx_outlier_detection import (
from chx_outlier_detection import is_outlier, outlier_mask

# from pyCHX.chx_specklecp import (
from chx_specklecp import (
get_binned_his_std,
Expand All @@ -197,28 +208,30 @@
xsvsc,
xsvsp,
)

# from pyCH.chx_xpcs_xsvs_jupyter_V1 import(
from chx_xpcs_xsvs_jupyter_V1 import(
get_t_iqc_uids,
plot_t_iqtMq2,
plot_t_iqc_uids,
plot_entries_from_csvlist,
plot_entries_from_uids,
get_iq_from_uids,
wait_func,
wait_data_acquistion_finish,
get_uids_by_range,
get_uids_in_time_period,
do_compress_on_line,
realtime_xpcs_analysis,
from chx_xpcs_xsvs_jupyter_V1 import (
compress_multi_uids,
get_two_time_mulit_uids,
get_series_g2_from_g12,
do_compress_on_line,
get_fra_num_by_dose,
get_iq_from_uids,
get_series_g2_from_g12,
get_series_one_time_mulit_uids,
get_t_iqc_uids,
get_two_time_mulit_uids,
get_uids_by_range,
get_uids_in_time_period,
plot_dose_g2,
plot_entries_from_csvlist,
plot_entries_from_uids,
plot_t_iqc_uids,
plot_t_iqtMq2,
realtime_xpcs_analysis,
run_xpcs_xsvs_single,
wait_data_acquistion_finish,
wait_func,
)

# from pyCHX.Create_Report import (
from Create_Report import (
create_multi_pdf_reports_for_uids,
Expand All @@ -228,8 +241,10 @@
extract_xpcs_results_from_h5,
make_pdf_report,
)
#from pyCHX.DataGonio import qphiavg

# from pyCHX.DataGonio import qphiavg
from DataGonio import qphiavg

# from pyCHX.SAXS import (
from SAXS import (
fit_form_factor,
Expand All @@ -240,7 +255,8 @@
poly_sphere_form_factor_intensity,
show_saxs_qmap,
)
#from pyCHX.Two_Time_Correlation_Function import (

# from pyCHX.Two_Time_Correlation_Function import (
from Two_Time_Correlation_Function import (
get_aged_g2_from_g12,
get_aged_g2_from_g12q,
Expand All @@ -249,6 +265,7 @@
rotate_g12q_to_rectangle,
show_C12,
)

# from pyCHX.XPCS_GiSAXS import (
from XPCS_GiSAXS import (
cal_1d_qr,
Expand All @@ -274,6 +291,7 @@
show_qzr_map,
show_qzr_roi,
)

# from pyCHX.XPCS_SAXS import (
from XPCS_SAXS import (
cal_g2,
Expand All @@ -295,8 +313,3 @@
recover_img_from_iq,
save_lists,
)
#from pyCHX.chx_outlier_detection import (
from chx_outlier_detection import (
is_outlier,
outlier_mask
)

0 comments on commit a4a2264

Please sign in to comment.