ignores

.gitignore

@@ -5,3 +5,5 @@ Results/
 Logs/
 build/
 slackwebhook.txt
+notification-channel-webhook.txt
+notification-channel-webhook-OLD.txt

S1Control.py

@@ -2269,7 +2269,7 @@ def assaySelected(event):
         return
     # print(f'selected_assay_catalogue_num={selected_assay_catalogue_num}')
     # selected_assay_application = selection['values'][2]
-    
+
     # get assay(s) in case of multiselect
     assays_to_plot = [
         assay_catalogue[int(assay_num) - 1]
@@ -5020,10 +5020,10 @@ def queryXraySettings_clicked():
             lightweight_mode_requested = True
 
     # GUI
-    thread_halt = False
-    quit_requested = False
-    SERIALNUMBERRECV = False
-    notification_webhook_url = None
+    thread_halt: bool = False
+    quit_requested: bool = False
+    SERIALNUMBERRECV: bool = False
+    notification_webhook_url: str = None
 
     # Colour Assignments
     WHITEISH = "#FAFAFA"

Sample Sequence CSVs/gerda_newgeo_SiO2_x10_both.csv

@@ -0,0 +1,61 @@
+ScanNumber,SampleNum,Name/Note,XPosition(mm),YPosition(mm),Illumination(optional),Time(sec)(optional)
+1,1,E50Silica_01,42,70,Geo_50,120
+2,1,E30Silica_01,42,70,Geo_30,120
+3,1,E15Silica_01,42,70,Geo_15,120
+4,1,E50Silica_02,42,70,Geo_50,120
+5,1,E30Silica_02,42,70,Geo_30,120
+6,1,E15Silica_02,42,70,Geo_15,120
+7,1,E50Silica_03,42,70,Geo_50,120
+8,1,E30Silica_03,42,70,Geo_30,120
+9,1,E15Silica_03,42,70,Geo_15,120
+10,1,E50Silica_04,42,70,Geo_50,120
+11,1,E30Silica_04,42,70,Geo_30,120
+12,1,E15Silica_04,42,70,Geo_15,120
+13,1,E50Silica_05,42,70,Geo_50,120
+14,1,E30Silica_05,42,70,Geo_30,120
+15,1,E15Silica_05,42,70,Geo_15,120
+16,1,E50Silica_06,42,70,Geo_50,120
+17,1,E30Silica_06,42,70,Geo_30,120
+18,1,E15Silica_06,42,70,Geo_15,120
+19,1,E50Silica_07,42,70,Geo_50,120
+20,1,E30Silica_07,42,70,Geo_30,120
+21,1,E15Silica_07,42,70,Geo_15,120
+22,1,E50Silica_08,42,70,Geo_50,120
+23,1,E30Silica_08,42,70,Geo_30,120
+24,1,E15Silica_08,42,70,Geo_15,120
+25,1,E50Silica_09,42,70,Geo_50,120
+26,1,E30Silica_09,42,70,Geo_30,120
+27,1,E15Silica_09,42,70,Geo_15,120
+28,1,E50Silica_10,42,70,Geo_50,120
+29,1,E30Silica_10,42,70,Geo_30,120
+30,1,E15Silica_10,42,70,Geo_15,120
+31,2,E50SiO2Fused_01,42,140,Geo_50,120
+32,2,E30SiO2Fused_01,42,140,Geo_30,120
+33,2,E15SiO2Fused_01,42,140,Geo_15,120
+34,2,E50SiO2Fused_02,42,140,Geo_50,120
+35,2,E30SiO2Fused_02,42,140,Geo_30,120
+36,2,E15SiO2Fused_02,42,140,Geo_15,120
+37,2,E50SiO2Fused_03,42,140,Geo_50,120
+38,2,E30SiO2Fused_03,42,140,Geo_30,120
+39,2,E15SiO2Fused_03,42,140,Geo_15,120
+40,2,E50SiO2Fused_04,42,140,Geo_50,120
+41,2,E30SiO2Fused_04,42,140,Geo_30,120
+42,2,E15SiO2Fused_04,42,140,Geo_15,120
+43,2,E50SiO2Fused_05,42,140,Geo_50,120
+44,2,E30SiO2Fused_05,42,140,Geo_30,120
+45,2,E15SiO2Fused_05,42,140,Geo_15,120
+46,2,E50SiO2Fused_06,42,140,Geo_50,120
+47,2,E30SiO2Fused_06,42,140,Geo_30,120
+48,2,E15SiO2Fused_06,42,140,Geo_15,120
+49,2,E50SiO2Fused_07,42,140,Geo_50,120
+50,2,E30SiO2Fused_07,42,140,Geo_30,120
+51,2,E15SiO2Fused_07,42,140,Geo_15,120
+52,2,E50SiO2Fused_08,42,140,Geo_50,120
+53,2,E30SiO2Fused_08,42,140,Geo_30,120
+54,2,E15SiO2Fused_08,42,140,Geo_15,120
+55,2,E50SiO2Fused_09,42,140,Geo_50,120
+56,2,E30SiO2Fused_09,42,140,Geo_30,120
+57,2,E15SiO2Fused_09,42,140,Geo_15,120
+58,2,E50SiO2Fused_10,42,140,Geo_50,120
+59,2,E30SiO2Fused_10,42,140,Geo_30,120
+60,2,E15SiO2Fused_10,42,140,Geo_15,120

Sample Sequence CSVs/gerda_sample_template_trayAonly.csv

@@ -0,0 +1,55 @@
+ScanNumber,SampleNum,Name/Note,Gerda tray,XPosition(mm),YPosition(mm),Illumination(optional),Time(sec)(optional)
+1,1,SampleName_01,A-1-01,42,70,,
+2,2,SampleName_02,A-1-02,42,105,,
+3,3,SampleName_03,A-1-03,42,140,,
+4,4,SampleName_04,A-1-04,42,175,,
+5,5,SampleName_05,A-1-05,42,210,,
+6,6,SampleName_06,A-1-06,42,245,,
+7,7,SampleName_07,A-1-07,77,70,,
+8,8,SampleName_08,A-1-08,77,105,,
+9,9,SampleName_09,A-1-09,77,140,,
+10,10,SampleName_10,A-1-10,77,175,,
+11,11,SampleName_11,A-1-11,77,210,,
+12,12,SampleName_12,A-1-12,77,245,,
+13,13,SampleName_13,A-1-13,112,70,,
+14,14,SampleName_14,A-1-14,112,105,,
+15,15,SampleName_15,A-1-15,112,140,,
+16,16,SampleName_16,A-1-16,112,175,,
+17,17,SampleName_17,A-1-17,112,210,,
+18,18,SampleName_18,A-1-18,112,245,,
+19,19,SampleName_19,A-2-01,152,70,,
+20,20,SampleName_20,A-2-02,152,105,,
+21,21,SampleName_21,A-2-03,152,140,,
+22,22,SampleName_22,A-2-04,152,175,,
+23,23,SampleName_23,A-2-05,152,210,,
+24,24,SampleName_24,A-2-06,152,245,,
+25,25,SampleName_25,A-2-07,187,70,,
+26,26,SampleName_26,A-2-08,187,105,,
+27,27,SampleName_27,A-2-09,187,140,,
+28,28,SampleName_28,A-2-10,187,175,,
+29,29,SampleName_29,A-2-11,187,210,,
+30,30,SampleName_30,A-2-12,187,245,,
+31,31,SampleName_31,A-2-13,222,70,,
+32,32,SampleName_32,A-2-14,222,105,,
+33,33,SampleName_33,A-2-15,222,140,,
+34,34,SampleName_34,A-2-16,222,175,,
+35,35,SampleName_35,A-2-17,222,210,,
+36,36,SampleName_36,A-2-18,222,245,,
+37,37,SampleName_37,A-3-01,262,70,,
+38,38,SampleName_38,A-3-02,262,105,,
+39,39,SampleName_39,A-3-03,262,140,,
+40,40,SampleName_40,A-3-04,262,175,,
+41,41,SampleName_41,A-3-05,262,210,,
+42,42,SampleName_42,A-3-06,262,245,,
+43,43,SampleName_43,A-3-07,297,70,,
+44,44,SampleName_44,A-3-08,297,105,,
+45,45,SampleName_45,A-3-09,297,140,,
+46,46,SampleName_46,A-3-10,297,175,,
+47,47,SampleName_47,A-3-11,297,210,,
+48,48,SampleName_48,A-3-12,297,245,,
+49,49,SampleName_49,A-3-13,332,70,,
+50,50,SampleName_50,A-3-14,332,105,,
+51,51,SampleName_51,A-3-15,332,140,,
+52,52,SampleName_52,A-3-16,332,175,,
+53,53,SampleName_53,A-3-17,332,210,,
+54,54,SampleName_54,A-3-18,332,245,,

notification-channel-webhook-OLD.txt

@@ -1 +1 @@
-https://hooks.slack.com/services/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
+https://hooks.slack.com/services/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

notification-channel-webhook.txt

@@ -1 +1 @@
-https://pxrfservices.webhook.office.com/webhookb2/3a6006c7-71bb-449d-a0bb-217ffe85e1a9@5bcbbd59-abb8-4079-ad52-9d7887060af0/IncomingWebhook/a3d010099d9b4a44b15d57aba3a4ff6d/80ceb6bd-2517-4cf9-8358-0d311cb797c4
+https://pxrfservices.webhook.office.com/webhookb2/3a6006c7-71bb-449d-a0bb-217ffe85e1a9@5bcbbd59-abb8-4079-ad52-9d7887060af0/IncomingWebhook/a3d010099d9b4a44b15d57aba3a4ff6d/80ceb6bd-2517-4cf9-8358-0d311cb797c4