Skip to content

Commit

Permalink
Showing 11 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion SPARC4_ACS/ACS files/Initialization/ACS_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.46.0
v1.46.1
2 changes: 1 addition & 1 deletion SPARC4_ACS/S4ACS.lvproj
Original file line number Diff line number Diff line change
@@ -264,7 +264,7 @@
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{77B8811B-88C5-4D06-B0B4-2511D9D9BCC5}</Property>
<Property Name="Bld_version.build" Type="Int">152</Property>
<Property Name="Bld_version.build" Type="Int">153</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">ACS.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/ACS/ACS.exe</Property>
2 changes: 1 addition & 1 deletion builds/ACS/ACS files/Initialization/ACS_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.46.0
v1.46.1
2 changes: 1 addition & 1 deletion builds/ACS/ACS files/Python/header/header.py
Original file line number Diff line number Diff line change
@@ -209,7 +209,7 @@ def fix_keywords(self):
self._write_log_file(repr(e), 'READRATE')

idx = self.find_index_tab()
self.hdr['GAIN'] = self.ss_gains[f"{self.hdr['CDDSERN']}"][idx]
self.hdr['GAIN'] = self.ss_gains[f"{self.hdr['CCDSERN']}"][idx]
self.hdr['RDNOISE'] = self.ss_read_noise[f"{self.hdr['CCDSERN']}"][idx]

def find_index_tab(self):
9 changes: 4 additions & 5 deletions builds/ACS/ACS files/Python/main.py
Original file line number Diff line number Diff line change
@@ -21,11 +21,10 @@ def main(night_dir, file, data, header_json):
hdr = fits.Header()
error_str = 'Warning: a wrong formatting was found in the header content.'
else:
# [Focuser, ICS, S4GUI, TCS, Weather_Station, General_KWs, CCD]:
# for cls in []:
# obj = cls(header_json, hdr, night_dir)
# obj.fix_keywords()
# hdr = obj.hdr
for cls in [Focuser, ICS, S4GUI, TCS, Weather_Station, General_KWs, CCD]:
obj = cls(header_json, hdr, night_dir)
obj.fix_keywords()
hdr = obj.hdr
data = fix_image_orientation(hdr['CHANNEL'], data)

file = verify_file_already_exists(file)
Binary file modified builds/ACS/ACS.exe
Binary file not shown.
Binary file modified builds/ACS/data/zmq_bind_random.vi
Binary file not shown.
Binary file modified builds/ACS/data/zmq_config_curve.vi
Binary file not shown.
Binary file modified builds/ACS/data/zmq_poll_scalar.vi
Binary file not shown.
Binary file modified builds/ACS/data/zmq_socket_check.vi
Binary file not shown.
Binary file modified builds/ACS/data/zmq_socket_set.vi
Binary file not shown.

0 comments on commit cce96aa

Please sign in to comment.