small fixes

DBernardes · May 21, 2024 · 25b8ad5 · 25b8ad5
1 parent 0188725
commit 25b8ad5
Show file tree

Hide file tree

Showing 34 changed files with 177 additions and 170 deletions.
diff --git a/SPARC4_ACS/ACS files/Initialization/ACS_version.txt b/SPARC4_ACS/ACS files/Initialization/ACS_version.txt
@@ -1 +1 @@
-v1.47.0
+v1.47.1
diff --git a/SPARC4_ACS/ACS files/Python/__pycache__/main.cpython-36.pyc b/SPARC4_ACS/ACS files/Python/__pycache__/main.cpython-36.pyc
diff --git a/SPARC4_ACS/ACS files/Python/__pycache__/utils.cpython-36.pyc b/SPARC4_ACS/ACS files/Python/__pycache__/utils.cpython-36.pyc
diff --git a/SPARC4_ACS/ACS files/Python/header/__pycache__/header.cpython-36.pyc b/SPARC4_ACS/ACS files/Python/header/__pycache__/header.cpython-36.pyc
diff --git a/SPARC4_ACS/ACS files/Python/main.py b/SPARC4_ACS/ACS files/Python/main.py
@@ -23,7 +23,6 @@ def main(night_dir, file, data, header_json):
             obj = cls(header_json, night_dir)
             obj.fix_keywords()
             hdr = obj.hdr
-        # obj.reset_header()
         try:
             data = fix_image_orientation(hdr['CHANNEL'], hdr['EMMODE'], data)
         except Exception as e:            

diff --git a/SPARC4_ACS/Channel/Channel.lvclass b/SPARC4_ACS/Channel/Channel.lvclass
@@ -378,13 +378,13 @@
 		<Property Name="NI.ClassItem.State" Type="Int">1107821072</Property>
 	</Item>
 	<Item Name="Log message.vi" Type="VI" URL="../Log message.vi">
-		<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">'!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%]!!!!#Q!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#:!=!!?!!!2$U.I97ZO:7QO&lt;(:D&lt;'&amp;T=Q!,1WBB&lt;GZF&lt;#"P&gt;81!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!71$$`````$'VF=X.B:W5A&gt;(FQ:1!!%%!Q`````Q:4&gt;(*J&lt;G=!!#:!=!!?!!!2$U.I97ZO:7QO&lt;(:D&lt;'&amp;T=Q!+1WBB&lt;GZF&lt;#"J&lt;A!!91$Q!!Q!!Q!%!!1!"1!%!!1!"!!%!!9!"Q!)!!E$!!"Y!!!.#!!!!!!!!!!!!!!.#Q!!!!!!!!!!!!!!!!!!!!!!!!I!!!%+!!!##!!!!")!!!U!!!!-!!!!!!!!!!!!!!%!#A!!!!!</Property>
+		<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">'!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%]!!!!#Q!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#:!=!!?!!!2$U.I97ZO:7QO&lt;(:D&lt;'&amp;T=Q!,1WBB&lt;GZF&lt;#"P&gt;81!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!71$$`````$'VF=X.B:W5A&gt;(FQ:1!!%%!Q`````Q:4&gt;(*J&lt;G=!!#:!=!!?!!!2$U.I97ZO:7QO&lt;(:D&lt;'&amp;T=Q!+1WBB&lt;GZF&lt;#"J&lt;A!!91$Q!!Q!!Q!%!!1!"1!%!!1!"!!%!!9!"Q!)!!E$!!"Y!!!.#!!!!!!!!!!!!!!.#Q!!!!!!!!!!!!!!!!!!!!!!!!I!!!))!!!##!!!!")!!!U!!!!-!!!!!!!!!!!!!!%!#A!!!!!</Property>
 		<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
 		<Property Name="NI.ClassItem.Flags" Type="Int">0</Property>
 		<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
 		<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
 		<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
-		<Property Name="NI.ClassItem.State" Type="Int">1107821072</Property>
+		<Property Name="NI.ClassItem.State" Type="Int">1115685392</Property>
 	</Item>
 	<Item Name="Manager Camera Communication.vi" Type="VI" URL="../Manager Camera Communication.vi">
 		<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">'!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%7!!!!#1!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#:!=!!?!!!2$U.I97ZO:7QO&lt;(:D&lt;'&amp;T=Q!,1WBB&lt;GZF&lt;#"P&gt;81!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!G1(!!(A!!%1^$;'&amp;O&lt;G6M,GRW9WRB=X-!#E.I97ZO:7QA;7Y!!'%!]!!-!!-!"!!%!!5!"!!%!!1!"!!'!!1!"!!(!Q!!?!!!$1A!!!!!!!!!!!!!$1M!!!!!!!!!!!!!!!!!!!!!!!!+!!!!!!!!!!!!!!!3!!!.!!!!$!!!!!!!!!!!!!!"!!A!!!!!</Property>

diff --git a/SPARC4_ACS/Channel/Get Commd.vi b/SPARC4_ACS/Channel/Get Commd.vi
diff --git a/SPARC4_ACS/Channel/Log message.vi b/SPARC4_ACS/Channel/Log message.vi
diff --git a/SPARC4_ACS/Channel/Treat Command.vi b/SPARC4_ACS/Channel/Treat Command.vi
diff --git a/SPARC4_ACS/Channel/verify parameters.vi b/SPARC4_ACS/Channel/verify parameters.vi
diff --git a/SPARC4_ACS/Channel/write command into SM.vi b/SPARC4_ACS/Channel/write command into SM.vi
diff --git a/SPARC4_ACS/Error log/log message.vi b/SPARC4_ACS/Error log/log message.vi
diff --git a/SPARC4_ACS/Log File/Log File.lvclass b/SPARC4_ACS/Log File/Log File.lvclass
diff --git a/SPARC4_ACS/Log File/get time stamp.vi b/SPARC4_ACS/Log File/get time stamp.vi
diff --git a/SPARC4_ACS/Log File/log message.vi b/SPARC4_ACS/Log File/log message.vi
diff --git a/SPARC4_ACS/S4ACS.lvlps b/SPARC4_ACS/S4ACS.lvlps
@@ -1,5 +1,5 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "52,363,806,741"
+ProjectExplorer.ClassicPosition[String] = "63,85,817,463"
 
 [AB_Cache_{EBD3E9D1-87EC-4D07-9D0E-E12F7D672B36}]
 Cache_Path[Path] Line0001 = "/C/Users/observer/AppData/Local/Temp/AB_Cache_{EBD"

diff --git a/SPARC4_ACS/S4ACS.lvproj b/SPARC4_ACS/S4ACS.lvproj
@@ -366,7 +366,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">163</Property>
+				<Property Name="Bld_version.build" Type="Int">165</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>

diff --git a/SPARC4_ACS/Save Image/Prepare header content.vi b/SPARC4_ACS/Save Image/Prepare header content.vi
diff --git a/builds/ACS.zip b/builds/ACS.zip
diff --git a/builds/ACS/ACS files/Initialization/ACS_version.txt b/builds/ACS/ACS files/Initialization/ACS_version.txt
@@ -1 +1 @@
-v1.47.0
+v1.47.1
diff --git a/builds/ACS/ACS files/Python/__pycache__/main.cpython-36.pyc b/builds/ACS/ACS files/Python/__pycache__/main.cpython-36.pyc
diff --git a/builds/ACS/ACS files/Python/__pycache__/utils.cpython-36.pyc b/builds/ACS/ACS files/Python/__pycache__/utils.cpython-36.pyc
diff --git a/builds/ACS/ACS files/Python/header/__pycache__/header.cpython-36.pyc b/builds/ACS/ACS files/Python/header/__pycache__/header.cpython-36.pyc
diff --git a/builds/ACS/ACS files/Python/header/header.py b/builds/ACS/ACS files/Python/header/header.py
@@ -217,7 +217,7 @@ def _initialize_kw_dataclass(self):
             ("ASEL_MODE", "ANMODE", bool),
             ("GMIR", "GMIR", float),
             ("GMIR_MODE", "GMIRMODE", bool),
-            ("GFOC", "GFOC", bool),
+            ("GFOC", "GFOC", float),
             ("GFOC_MODE", "GFOCMODE", bool),
             ("ICSVRSN", "ICSVRSN", str),
         ]

diff --git a/builds/ACS/ACS files/Python/main.py b/builds/ACS/ACS files/Python/main.py
@@ -23,12 +23,10 @@ def main(night_dir, file, data, header_json):
             obj = cls(header_json, night_dir)
             obj.fix_keywords()
             hdr = obj.hdr
-        # obj.reset_header()
         try:
-            data = fix_image_orientation(hdr['CHANNEL'], data)
-        except:
-            error_str = '[WARNNING] The "CHANNEL" keyword was not found.'
-            write_error_log(error_str, night_dir)
+            data = fix_image_orientation(hdr['CHANNEL'], hdr['EMMODE'], data)
+        except Exception as e:            
+            write_error_log(repr(e), night_dir)
 
     file = verify_file_already_exists(file)
     fits.writeto(file, data, hdr, output_verify='ignore')

diff --git a/builds/ACS/ACS files/Python/utils.py b/builds/ACS/ACS files/Python/utils.py
@@ -59,12 +59,18 @@ def load_json(header_json):
         return None
 
 
-def fix_image_orientation(channel, data):
-    setup = {1: [False, True, 2],
+def fix_image_orientation(channel, em_mode, data):
+    setup = {'Conventional': 
+             {1: [False, True, 2],
              2: [False, False, 0],
              3: [True, False, -1],
-             4: [False, False, -1]}
-    invert_x, invert_y, nrot = setup[channel]
+             4: [False, False, -1]},
+             'Electron Multiplying': 
+             {1: [True, True, 2],
+             2: [True, False, 0],
+             3: [True, True, -1],
+             4: [False, True, -1]}}
+    invert_x, invert_y, nrot = setup[em_mode][channel]
     return rotate_image(data, invert_x, invert_y, nrot)
 
 

diff --git a/builds/ACS/ACS.exe b/builds/ACS/ACS.exe
diff --git a/builds/ACS/data/zmq_bind_random.vi b/builds/ACS/data/zmq_bind_random.vi
diff --git a/builds/ACS/data/zmq_config_curve.vi b/builds/ACS/data/zmq_config_curve.vi
diff --git a/builds/ACS/data/zmq_ctx_check.vi b/builds/ACS/data/zmq_ctx_check.vi
diff --git a/builds/ACS/data/zmq_poll_scalar.vi b/builds/ACS/data/zmq_poll_scalar.vi
diff --git a/builds/ACS/data/zmq_socket.vi b/builds/ACS/data/zmq_socket.vi
diff --git a/builds/ACS/data/zmq_socket_check.vi b/builds/ACS/data/zmq_socket_check.vi
diff --git a/builds/ACS/data/zmq_socket_set.vi b/builds/ACS/data/zmq_socket_set.vi