diff --git a/SPARC4_ACS/ACS files/Initialization/ACS_version.txt b/SPARC4_ACS/ACS files/Initialization/ACS_version.txt index 16859c15..d72e2d21 100644 --- a/SPARC4_ACS/ACS files/Initialization/ACS_version.txt +++ b/SPARC4_ACS/ACS files/Initialization/ACS_version.txt @@ -1 +1 @@ -v1.46.0 \ No newline at end of file +v1.46.1 \ No newline at end of file diff --git a/SPARC4_ACS/S4ACS.lvproj b/SPARC4_ACS/S4ACS.lvproj index 03a076e2..5bb1a8a7 100644 --- a/SPARC4_ACS/S4ACS.lvproj +++ b/SPARC4_ACS/S4ACS.lvproj @@ -264,7 +264,7 @@ relativeToCommon true {77B8811B-88C5-4D06-B0B4-2511D9D9BCC5} - 152 + 153 1 ACS.exe ../builds/ACS/ACS.exe diff --git a/builds/ACS/ACS files/Initialization/ACS_version.txt b/builds/ACS/ACS files/Initialization/ACS_version.txt index 16859c15..d72e2d21 100644 --- a/builds/ACS/ACS files/Initialization/ACS_version.txt +++ b/builds/ACS/ACS files/Initialization/ACS_version.txt @@ -1 +1 @@ -v1.46.0 \ No newline at end of file +v1.46.1 \ No newline at end of file diff --git a/builds/ACS/ACS files/Python/header/header.py b/builds/ACS/ACS files/Python/header/header.py index 43bb6670..a28984a4 100644 --- a/builds/ACS/ACS files/Python/header/header.py +++ b/builds/ACS/ACS files/Python/header/header.py @@ -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): diff --git a/builds/ACS/ACS files/Python/main.py b/builds/ACS/ACS files/Python/main.py index 6debd676..f4cc77a9 100644 --- a/builds/ACS/ACS files/Python/main.py +++ b/builds/ACS/ACS files/Python/main.py @@ -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) diff --git a/builds/ACS/ACS.exe b/builds/ACS/ACS.exe index ed198b45..3b00eb5a 100644 Binary files a/builds/ACS/ACS.exe and b/builds/ACS/ACS.exe differ diff --git a/builds/ACS/data/zmq_bind_random.vi b/builds/ACS/data/zmq_bind_random.vi index 60e29b35..3008c057 100644 Binary files a/builds/ACS/data/zmq_bind_random.vi and b/builds/ACS/data/zmq_bind_random.vi differ diff --git a/builds/ACS/data/zmq_config_curve.vi b/builds/ACS/data/zmq_config_curve.vi index 75006f52..04d5330a 100644 Binary files a/builds/ACS/data/zmq_config_curve.vi and b/builds/ACS/data/zmq_config_curve.vi differ diff --git a/builds/ACS/data/zmq_poll_scalar.vi b/builds/ACS/data/zmq_poll_scalar.vi index 042ef5e4..50385abd 100644 Binary files a/builds/ACS/data/zmq_poll_scalar.vi and b/builds/ACS/data/zmq_poll_scalar.vi differ diff --git a/builds/ACS/data/zmq_socket_check.vi b/builds/ACS/data/zmq_socket_check.vi index f62218ad..1e6bcb19 100644 Binary files a/builds/ACS/data/zmq_socket_check.vi and b/builds/ACS/data/zmq_socket_check.vi differ diff --git a/builds/ACS/data/zmq_socket_set.vi b/builds/ACS/data/zmq_socket_set.vi index 57cf6440..a4a1cc29 100644 Binary files a/builds/ACS/data/zmq_socket_set.vi and b/builds/ACS/data/zmq_socket_set.vi differ