V2 common essential modules for _commonspeckle

[ambarb]

Confirmed this PR only touches files in pyCHX/v2/_commonspeckle

Now the following modules should import in any conda environment (does not require Broker.named = 'chx')

['pyCHX.v2._commonspeckle.movie_maker',
 'pyCHX.v2._commonspeckle.XPCS_XSVS_SAXS_Multi_2017_V4',
 'pyCHX.v2._commonspeckle.chx_xpcs_xsvs_jupyter_V1',
 'pyCHX.v2._commonspeckle.chx_libs',
 'pyCHX.v2._commonspeckle.chx_Fitters2D',
 'pyCHX.v2._commonspeckle.chx_generic_functions',
 'pyCHX.v2._commonspeckle.chx_compress',
 'pyCHX.v2._commonspeckle.chx_compress_analysis',
 'pyCHX.v2._commonspeckle.chx_correlation',
 'pyCHX.v2._commonspeckle.chx_correlationc',
 'pyCHX.v2._commonspeckle.Two_Time_Correlation_Function',
 'pyCHX.v2._commonspeckle.chx_correlationp',
 'pyCHX.v2._commonspeckle.chx_correlationp2',
 'pyCHX.v2._commonspeckle.chx_speckle',
 'pyCHX.v2._commonspeckle.chx_specklecp',
 'pyCHX.v2._commonspeckle.DataGonio',
 'pyCHX.v2._commonspeckle.SAXS',
 'pyCHX.v2._commonspeckle.Stitching',
 'pyCHX.v2._commonspeckle.XPCS_GiSAXS',
 'pyCHX.v2._commonspeckle.XPCS_SAXS']

The following modules have not been configured/tested. These will be addressed later.

• Badpixels.py (delete)
• chx_packages.py (delete)
• xpcs_timepixel.py (delete, but wait first to see if useful info)
• DEVS.py (delete, part of crosscorr project)
• chx_crosscor.py (delete, part of crosscorr project)
• Compress_readerNew.py (not yet, needs evaluation first, low priority)
• Create_Report.py (not yet, needs evaluation first, low priority)
• chx_olog.py (not yet, needs evaluation first, low priority, maybe some pyOlog tools here)

@tankonst FYI so if you want to try before PR is merged to the main branch of pyCHX.

[ambarb]

https://github.com/ambarb/XPCS_CHX_CSX_one_repo/blob/master/XPCS_CHX_CSX_one_repo/Check_all_imports_commonspeck.ipynb

maybe this is easier to review

[ambarb]

@danielballan i am a little confused about this PR. it says there are conflicts, but when I look at the files changed view, nothing indicdates there is a conflict. I've seen that in the past conflict show up on this page https://github.com/NSLS-II/pyCHX/pull/46/files. Can you recommend another tool for me to sort this out?

[danielballan]

Confirmed locally that this does not rebase cleanly on master. I can help on a call if you want, or just do it.

[ambarb]

I should learn. can I schedule time tomorrow? otherwise, early next week is ok to.

[ambarb]

there are a lot of files here but the only one @afluerasu will care about is: pyCHX/XPCS_XSVS_SAXS_Multi_2017_V4.py --> which may be obsolete as discussed

I just undid the erroneous edit i made. I didn't figure out how to undo the "edit" using git. The file is the same if you look by eye, it just wasn't worth the single line mistake i made, but it matches what you have installed at CHX.

Notebooks still indicates all v2._commonspeckle modules import at CSX.

[ambarb]

@danielballan thanks for the rebase tutorial. it was really good.

There was something funny after all the conflicts resolved when i diff'ed between my local files and the remote files on this fork's branch, so I was scared to force the push. i instead pulled the remote, fixed a few small things, and then finally pushed my local copy to the remote. All looks good. May be some circular changes but I think everything is ok.