Skip to content

Commit

Permalink
Updates during 2015_3 HSTDP testing:
Browse files Browse the repository at this point in the history
    - Removed the call to WF3Dth for the CTE data. This is essentially useless since the DTH step has been replaced with astrodrizzle, the only function it has it to concatinate the SPT files from the association members into a new spt file with the product/subproduct name. This is already done for the non-cte processed data, there is no difference between the cte and non-cte SPT files, they are only related to the RAW input file. 



git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/hstcal/trunk@48681 fe389314-cf27-0410-b35b-8c050e845b92
  • Loading branch information
sosey committed Jan 28, 2016
1 parent b49c5a7 commit 39040ab
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 49 deletions.
3 changes: 3 additions & 0 deletions pkg/wfc3/calwf3/Dates
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
28-Jan-2016 - MLS -- Version 3.3
- Removed the call to WF3Dth for the CTE data. This is essentially useless since the DTH step has been replaced with astrodrizzle, the only function it has it to concatinate the SPT files from the association members into a new spt file with the product/subproduct name. This is already done for the non-cte processed data, there is no difference between the cte and non-cte SPT files, they are only related to the RAW input file.

22-Jan-2016 - MLS -- Version 3.3
- Noticed I missed renaming the crc file with the call to WF3DTH and was setting the input to the crj suffix, but also needed updates to GetAsnTable to include crc filename population for subproducts and sending the correct subproduct through processing, it was always using crj
- some code cleanup as I went
Expand Down
5 changes: 5 additions & 0 deletions pkg/wfc3/calwf3/History
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 28-Jan-2016 - MLS -- Version 3.3
- Removed the call to WF3Dth for the CTE data. This is essentially useless since the DTH step has been replaced with astrodrizzle, the only function it has it to concatina
te the SPT files from the association members into a new spt file with the product/subproduct name. This is already done for the non-cte processed data, there is no difference
between the cte and non-cte SPT files, they are only related to the RAW input file.

### 22-Jan-2016 MLS -- Version 3.3
- Noticed I missed renaming the crc file with the call to WF3DTH and was setting the input to the crj suffix, but also needed updates to GetAsnTable to include crc filename population for subproducts and sending the correct subproduct through processing, it was always using crj
- some code cleanup as I went
Expand Down
5 changes: 5 additions & 0 deletions pkg/wfc3/calwf3/Updates
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Updates for Version 3.3 28-Jan-2016 MLS
- Removed the call to WF3Dth for the CTE data. This is essentially useless since the DTH step has been replaced with astrodrizzle, the only function it has it to concatina
te the SPT files from the association members into a new spt file with the product/subproduct name. This is already done for the non-cte processed data, there is no difference
between the cte and non-cte SPT files, they are only related to the RAW input file.

Updates for Version 3.3 22-Jan-2016 MLS
- Noticed I missed renaming the crc file with the call to WF3DTH and was setting the input to the crj suffix, but also needed updates to GetAsnTable to include crc filename population for subproducts and sending the correct subproduct through processing, it was always using crj
- some code cleanup as I went
Expand Down
48 changes: 0 additions & 48 deletions pkg/wfc3/calwf3/calwf3/calwf3.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,54 +286,6 @@ int CalWf3Run (char *input, int printtime, int save_tmp, int verbose, int debug,

}

/* For each DTH product in UVIS WITH CTE... */
if (asn.verbose) {
trlmessage ("CALWF3: Building DTH products for CTE data....");
}

for (prod = 0; prod < asn.numprod; prod++) {
wf3dth_input = BuildDthInput (&asn, prod, suffix_flc);

/* Skip this product if the input list is empty */
if (wf3dth_input == NULL) {
printf("\nProduct %i input list empty, continuing..\n",prod);
continue;
}

/* We always want to create a final concatenated trailer file
** for the entire association whether there is a product or
** not. So we set up the trailer file based on the association
** file name itself. */

if (strcmp(asn.product[prod].prodname,"") != 0){
InitDthTrl(wf3dth_input,asn.product[prod].prodname);
} else {
InitDthTrl (wf3dth_input, asn.rootname);
}

/* Check if we have a PROD-DTH specified */

if (strcmp(asn.product[prod].prodname,"") != 0) {

if ((asn.dthcorr == PERFORM || asn.dthcorr == DUMMY)) {
if (Wf3Dth (wf3dth_input,
asn.product[prod].prodname, asn.dthcorr,
printtime, asn.verbose) )
return (status);

/* Pass posid=0 to indicate a PRODUCT is to
** be updated */
updateAsnTable(&asn, prod, NOPOSID);

} else {

trlwarn
("No DTH product name specified. No product created.");
/* status = WF3_OK; */
}
}

}
} /* End DTHCORR UVIS Processing */

} else { /*PROCESS THE IR DATA*/
Expand Down
2 changes: 1 addition & 1 deletion pkg/wfc3/calwf3/include/wf3version.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* This string is written to the output primary header as CAL_VER. */

# define WF3_CAL_VER "3.3(22-Jan-2016)"
# define WF3_CAL_VER "3.3(28-Jan-2016)"
# define WF3_CAL_VER_NUM "3.3"

0 comments on commit 39040ab

Please sign in to comment.