Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ number of the code change for that issue. These PRs can be viewed at:
- Fixed scipy deprecations in catalog_utils.py and hap_flag_filter.py.
[#2032]

- Updated alignment configuration parameters json files and removed those that
were obsolete; updated documentation for these files. [#2037]

3.10.0 (21-May-2025)
====================

Expand Down
8 changes: 8 additions & 0 deletions doc/source/mast_data_products/align_par_table.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
,ACS,ACS,ACS,WFC3,WFC3,WFC3,WFPC2
Nexposures,HRC,SBC,WFC,IR,UVIS (post2012),UVIS (pre2012),PC
1,acs_hrc_any_n1,acs_sbc_blue_n1,acs_wfc_any_n1,wfc3_ir_any_n1,wfc3_uvis_any_post_n1,wfc3_uvis_any_pre_n1,wfpc2_pc_any_n1
2,acs_hrc_any_n2,acs_sbc_blue_n2,acs_wfc_any_n2,wfc3_ir_any_n2,wfc3_uvis_any_post_n2,wfc3_uvis_any_pre_n2,wfpc2_pc_any_n2
3,acs_hrc_any_n2,acs_sbc_blue_n2,acs_wfc_any_n2,wfc3_ir_any_n2,wfc3_uvis_any_post_n2,wfc3_uvis_any_pre_n2,wfpc2_pc_any_n3
4,acs_hrc_any_n2,acs_sbc_blue_n2,acs_wfc_any_n2,wfc3_ir_any_n4,wfc3_uvis_any_post_n2,wfc3_uvis_any_pre_n4,wfpc2_pc_any_n4
5,acs_hrc_any_n2,acs_sbc_blue_n2,acs_wfc_any_n2,wfc3_ir_any_n4,wfc3_uvis_any_post_n2,wfc3_uvis_any_pre_n4,wfpc2_pc_any_n4
6+,acs_hrc_any_n6,acs_sbc_blue_n6,acs_wfc_any_n6,wfc3_ir_any_n4,wfc3_uvis_any_post_n6,wfc3_uvis_any_pre_n6,wfpc2_pc_any_n4
25 changes: 21 additions & 4 deletions doc/source/mast_data_products/hap-parameters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,30 @@ HAP Parameters

In the high-level svm_parameters or mvm_parameters directories, the instrument/detector-dependent configuration index files (e.g., acs_sbc_index.json) provide a map to the configuration files used for the major HAP processing steps. The svm_parameter configuration files are also used for pipeline products.


For the astrodrizzle step, there are different files which should be employed depending upon the number of exposures int the visit.

.. _detector_configuration_files:

Detector Configuration Files
****************************

For the astrodrizzle step, there are different files which should be employed depending upon the number of exposures int the visit. Examples of these files include names that end in "any_n1" or "any_n2" generally representing the configuration files for the case of one or two exposures. The naming convention, however, can differ for each detector. The following table shows the general naming convention, followed by exceptions to these rules.


.. csv-table:: Pipeline and SVM Alignment Parameter File Conditions
:file: align_par_table.csv
:header-rows: 2

Exceptions:

* For MVM processing, if the number of exposures is 1, the corresponding alignment configuration file name will end in "any_1.json". Otherwise it will end in "any_n2" for two or more exposures.
* ACS/SBC: if the filters "F115LP" or "F122M" are used, the alignment configuration file will end in "acs_sbc_any_any".
* WFC3/IR (grism): if the grism filters "G106" or "G141" are used, the alignment configuration file will end in "wfc3_ir_grism_n2" for two or three exposures, or "wfc3_ir_grism_n4" if there are 4 or more exposures.
* WFC3/UVIS: As shown in the table, different configuration files are used "pre" and "post" November 8th, 2012.


.. note::
The alignment configuration names listed above correspond to a condition within the code that corresponds to a similar looking filename. The mapping of the condition to the filenames is listed in the "instrument_detector_index.json" files, like the following example.


acs_hrc_index.json

.. code-block:: python
Expand All @@ -37,7 +54,7 @@ acs_hrc_index.json
}
}

The different files for "astrodrizzle" are for the case of 1 exposure ("any_n1"), 2 exposures (acs_hrc_any_n2), etc. Each json file with an associated task above (e.g. astrodrizzle) will have the parameters for that task. These files will be used to initialize variables that are required in the processing of the data and, in the case of "astrodrizzle", are separated into different steps.
Each json file with an associated task above (e.g. astrodrizzle) will have the parameters for that task. These files will be used to initialize variables that are required in the processing of the data and, in the case of "astrodrizzle", are separated into different steps.


Detector Configuration Files for Alignment
Expand Down
3 changes: 2 additions & 1 deletion doc/source/mast_data_products/svm_processing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,8 @@ detector, selection information can take the form of the number of input observa
the date that the observations were taken, the central filter wavelength, or the dispersive
element type. For example, a **filter product** would end up using the **filter_basic**
criteria, while an 8 exposure ACS/WFC association would end up selecting the
**acs_wfc_any_n6** entry.
**acs_wfc_any_n6** entry. For more details on the alignment configuration files,
see the :ref:`detector_configuration_files` section.


User-customization of Parameters
Expand Down
12 changes: 3 additions & 9 deletions drizzlepac/haputils/config_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,8 @@ def _determine_conditions(self, prod_obj):
if n_exp > 1:
self.conditions.append("acs_hrc_any_n2")
if self.hap_pipeline_name == 'svm':
if n_exp in [2, 3]:
if n_exp in [2, 3, 4, 5]:
self.conditions.append("acs_hrc_any_n2")
if n_exp in [4, 5]:
self.conditions.append("acs_hrc_any_n4")
if n_exp >= 6:
self.conditions.append("acs_hrc_any_n6")
elif self.detector == "sbc":
Expand All @@ -194,10 +192,8 @@ def _determine_conditions(self, prod_obj):
if n_exp > 1:
self.conditions.append("acs_wfc_any_n2")
if self.hap_pipeline_name == 'svm':
if n_exp in [2, 3]:
if n_exp in [2, 3, 4, 5]:
self.conditions.append("acs_wfc_any_n2")
if n_exp in [4, 5]:
self.conditions.append("acs_wfc_any_n4")
if n_exp >= 6:
self.conditions.append("acs_wfc_any_n6")
else:
Expand Down Expand Up @@ -229,10 +225,8 @@ def _determine_conditions(self, prod_obj):
# granular enough.
mjdutc = prod_obj.edp_list[0].mjdutc
if mjdutc >= thresh_time:
if n_exp in [2, 3]:
if n_exp in [2, 3, 4, 5]:
self.conditions.append("wfc3_uvis_any_post_n2")
if n_exp in [4, 5]:
self.conditions.append("wfc3_uvis_any_post_n4")
if n_exp >= 6:
self.conditions.append("wfc3_uvis_any_post_n6")
else:
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading