-
- Downloads
converted most calls of Detector2D from old to new API
# Automatic editing of collection of source files. # Does not provide backup files: # to be safe, work on fresh git commit, and use 'git stash' to revert. import edtools as et import re, sys def f(t): t = re.sub(r'--(\d)', r'+\1', t) t = re.sub(r'\+-(\d)', r'-\1', t) t = re.sub(r'\s*\*\s*deg', r'', t) t = f'{eval(t)}' t = re.sub('\.0$', '', t) if t != '0': t += '*deg' return t def user_edit(fn, ti): t = re.sub(r'OldDetec2D(\s+\w+)?\((n\w*|\d+),\s*([-.0-9]+\s*\*\s*deg|0),\s*([-.0-9]+\s*\*\s*deg|0),\s*(n\w*|\d+),\s*([-.0-9]+\s*\*\s*deg|0),\s*([-.0-9]+\s*\*\s*deg|0)\)', r'NewDetec2D\1(@(\4-\3)@, @(\7-\6)@, \2, \5, @(\4+\3)/2@, @(\7+\6)/2@)', ti) if t == ti: return ti # t = re.sub(r'@(\(.*?\)(/2)?)@', f(r'\1'), t) for m in re.finditer(r'@(\(.*?\)(/2)?)@', t): s = f(m.group(1)) t = re.sub(r'@(\(.*?\)(/2)?)@', s, t, 1) return t et.ed_argfiles(user_edit)
Showing
- Tests/Functional/Fitting/FitTests.cpp 1 addition, 1 deletionTests/Functional/Fitting/FitTests.cpp
- Tests/Py/Functional/PyFuTestInfrastructure.py 2 additions, 2 deletionsTests/Py/Functional/PyFuTestInfrastructure.py
- Tests/SimFactory/MakeSimulations.cpp 13 additions, 13 deletionsTests/SimFactory/MakeSimulations.cpp
- Wrap/Python/std_simulations.py 1 addition, 1 deletionWrap/Python/std_simulations.py
- auto/Examples/fit/scatter2d/consecutive_fitting.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/consecutive_fitting.py
- auto/Examples/fit/scatter2d/expfit_galaxi.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/expfit_galaxi.py
- auto/Examples/fit/scatter2d/fit2d.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/fit2d.py
- auto/Examples/fit/scatter2d/gisas_model1.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/gisas_model1.py
- auto/Examples/fit/scatter2d/minimizer_settings.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/minimizer_settings.py
- auto/Examples/fit/scatter2d/model1_cylinders.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/model1_cylinders.py
- auto/Examples/fit/scatter2d/model2_hexlattice.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/model2_hexlattice.py
- auto/Examples/fit/scatter2d/multiple_datasets.py 1 addition, 1 deletionauto/Examples/fit/scatter2d/multiple_datasets.py
- auto/Examples/scatter2d/ApproximationDA.py 1 addition, 1 deletionauto/Examples/scatter2d/ApproximationDA.py
- auto/Examples/scatter2d/ApproximationLMA.py 1 addition, 1 deletionauto/Examples/scatter2d/ApproximationLMA.py
- auto/Examples/scatter2d/ApproximationSSCA.py 1 addition, 1 deletionauto/Examples/scatter2d/ApproximationSSCA.py
- auto/Examples/scatter2d/BeamDivergence.py 1 addition, 1 deletionauto/Examples/scatter2d/BeamDivergence.py
- auto/Examples/scatter2d/BiMaterialCylinders.py 1 addition, 1 deletionauto/Examples/scatter2d/BiMaterialCylinders.py
- auto/Examples/scatter2d/BoxesWithSpecularPeak.py 1 addition, 1 deletionauto/Examples/scatter2d/BoxesWithSpecularPeak.py
- auto/Examples/scatter2d/ConstantBackground.py 1 addition, 1 deletionauto/Examples/scatter2d/ConstantBackground.py
- auto/Examples/scatter2d/CoreShellNanoparticles.py 1 addition, 1 deletionauto/Examples/scatter2d/CoreShellNanoparticles.py
Loading
Please register or sign in to comment