Skip to content
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

Removed target name from canon site and conformer site tags (issue 1496) #652

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Removed target name from canon site and conformer site tags (issue 1496) #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 24 additions & 4 deletions viewer/target_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,10 +1807,19 @@ def process_bundle(self):
for val in canon_site_objects.values(): # pylint: disable=no-member
prefix = val.instance.canon_site_num
# tag = canon_name_tag_map.get(val.versioned_key, "UNDEFINED")
tag = val.versioned_key
so_list = SiteObservation.objects.filter(
canon_site_conf__canon_site=val.instance
)
try:
tag = val.versioned_key.split('-')[1]
main_obvs = val.instance.ref_conf_site.ref_site_observation
code_prefix = experiment_objects[main_obvs.experiment.code].index_data[
"code_prefix"
]
tag = f"{code_prefix}{tag}"
except IndexError:
tag = val.versioned_key

self._tag_observations(
tag, prefix, category=cat_canon, site_observations=so_list
)
Expand All @@ -1826,11 +1835,21 @@ def process_bundle(self):
f"{val.instance.canon_site.canon_site_num}"
+ f"{next(numerators[val.instance.canon_site.canon_site_num])}"
)
# tag = val.instance.name.split('+')[0]
tag = val.instance.name
so_list = [
site_observation_objects[k].instance for k in val.index_data["members"]
]
# tag = val.instance.name.split('+')[0]
# tag = val.instance.name
try:
tag = val.instance.name.split('-')[1]
main_obvs = val.instance.ref_site_observation
code_prefix = experiment_objects[main_obvs.experiment.code].index_data[
"code_prefix"
]
tag = f"{code_prefix}{tag}"
except IndexError:
tag = val.instance.name

self._tag_observations(
tag, prefix, category=cat_conf, site_observations=so_list, hidden=True
)
Expand All @@ -1855,10 +1874,11 @@ def process_bundle(self):
cat_xtal = TagCategory.objects.get(category="Crystalforms")
for val in xtalform_objects.values(): # pylint: disable=no-member
prefix = f"F{val.instance.xtalform_num}"
tag = val.instance.name
so_list = SiteObservation.objects.filter(
xtalform_site__xtalform=val.instance
)
tag = val.instance.name

self._tag_observations(
tag, prefix, category=cat_xtal, site_observations=so_list
)
Expand Down