Skip to content

Multi Materials Overwrites HKL data , issue 302 #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfverberg merged 10 commits into from
Oct 19, 2026
Merged

Multi Materials Overwrites HKL data , issue 302 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4bc0c5a
style: some trivial style changes
rolfverberg Sep 2, 2026
f810123
Merge branch 'main' into multimat
rolfverberg Sep 2, 2026
595145b
Merge branch 'main' into multimat
rolfverberg Sep 22, 2026
23f86ea
Merge branch 'main' into multimat
rolfverberg Sep 24, 2026
a1a9689
Merge branch 'main' into multimat
rolfverberg Oct 13, 2026
24808b8
fix: fixes a merge error in CHAP/edd/processor.py
rolfverberg Oct 14, 2026
304b15d
add: adds multiple MultpiPeak models for multi component fitting
rolfverberg Oct 14, 2026
cac2041
feat: adds data_unconstrained, data_uniform and uniform fit parameters
rolfverberg Oct 16, 2026
9d4ec66
fix: fixes bug in the uniform strain errors
rolfverberg Oct 16, 2026
f92e5b3
fix: removes obsolete Rosette Strain computation from Strain analysis
rolfverberg Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CHAP/edd/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,9 +859,6 @@ class StrainAnalysisConfig(MCACalibrationConfig):
configuration
:class:`~CHAP.edd.models.MCADetectorStrainAnalysis`).
:vartype abs_height_cutoff: int, optional
:ivar calc_rosette_strains: Compute and add the rosette strain
fields defaults to `False`.
:vartype calc_rosette_strains: bool, optional
:ivar find_peak_cutoff: Use scipy.signal.find_peaks to exclude
peaks for all spectra for a given detector and user specified
mask. A particular HKL peak is removed from the set of HKLs,
Expand Down Expand Up @@ -892,7 +889,6 @@ class StrainAnalysisConfig(MCACalibrationConfig):
#:vartype oversampling: FIX

abs_height_cutoff: Optional[conint(gt=0)] = None
calc_rosette_strains: Optional[bool] = False
find_peak_cutoff: Optional[confloat(ge=0, allow_inf_nan=False)] = 0.0
max_nfev: Optional[conint(gt=0)] = None
num_proc: Optional[conint(gt=0)] = max(1, os.cpu_count()//4)
Expand Down
Loading
Loading