Skip to content

fix dictionary referencing #194

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
merged 3 commits into from
Jun 28, 2025
Merged

fix dictionary referencing #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f40fc20
fix dictionary referencing
dafda1 Jun 27, 2025
66c3782
Merge branch 'AdvancedPhotonSource:main' into main
dafda1 Jun 28, 2025
254de1c
fix abspath arguments issue
dafda1 Jun 28, 2025
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
2 changes: 1 addition & 1 deletion GSASII/GSASIIscriptable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ def add_phase(self, phasefile=None, phasename=None, histograms=[],

# process constraints, currently generated only from ISODISTORT CIFs
if phasereader.Constraints:
Constraints = self.data['Constraints']
Constraints = self.data['Constraints']['data']
for i in phasereader.Constraints:
if isinstance(i, dict):
if '_Explain' not in Constraints:
Expand Down
2 changes: 1 addition & 1 deletion GSASII/install/makeLinux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def Usage():
# find the main GSAS-II script if not on command line
path2GSAS2 = os.path.dirname(os.path.dirname(__file__))
path2repo = os.path.dirname(path2GSAS2)
G2script = os.path.abspath(path2GSAS2,"G2.py")
G2script = os.path.abspath(os.path.join(path2GSAS2,"G2.py"))
elif __file__.endswith("makeLinux.py") and len(sys.argv) == 2:
G2script = os.path.abspath(sys.argv[1])
path2GSAS2 = os.path.dirname(G2script)
Expand Down