From da11900fb53f01bac71be1f82498bb7790df6987 Mon Sep 17 00:00:00 2001
From: Giuseppe Carboni <giuseppecarboni89@live.com>
Date: Tue, 9 Jul 2024 14:05:14 +0000
Subject: [PATCH] Various QBand updates

---
 Common/Clients/CaltoolClient/src/_ctc.py      |  4 ++--
 .../NormalModeSetup.xml}                      |  7 ++++++-
 .../Modes/SINGLEDISH/SINGLEDISH.xml           | 20 -------------------
 .../SRTQBandReceiver/Modes/VLBI/VLBI.xml      | 20 -------------------
 .../NormalModeSetup/NormalModeSetup.xml}      |  7 ++++++-
 .../CDB/alma/RECEIVERS/Boss/Boss.xml          |  2 ++
 6 files changed, 16 insertions(+), 44 deletions(-)
 rename SRT/CDB/alma/DataBlock/SRTQBandReceiver/{Modes/SINGLEDISH/SINGLEDISH.xml => NormalModeSetup/NormalModeSetup.xml} (85%)
 delete mode 100644 SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
 delete mode 100644 SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml
 rename SRT/{CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml => Configuration/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml} (85%)

diff --git a/Common/Clients/CaltoolClient/src/_ctc.py b/Common/Clients/CaltoolClient/src/_ctc.py
index a226d1b30..4606372f8 100644
--- a/Common/Clients/CaltoolClient/src/_ctc.py
+++ b/Common/Clients/CaltoolClient/src/_ctc.py
@@ -120,8 +120,8 @@ class MyWorker(QThread):
                 self.emit(Qt.SIGNAL("scanAxis"),scanaxis)
                 (azOffset,_)=self.azimuthOffset.get_sync()
                 (elOffset,_)=self.elevationOffset.get_sync()
-                self.emit(Qt.SIGNAL("azoffset"),f'{azOffset/math.pi*180:.3f}')
-                self.emit(Qt.SIGNAL("eloffset"),f'{elOffset/math.pi*180:.3f}')
+                self.emit(Qt.SIGNAL("azoffset"),f'{azOffset/math.pi*180:.4f}')
+                self.emit(Qt.SIGNAL("eloffset"),f'{elOffset/math.pi*180:.4f}')
 
                 rec= self.caltool.isRecording()
                 if rec==True:
diff --git a/SRT/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml b/SRT/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml
similarity index 85%
rename from SRT/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
rename to SRT/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml
index 13732b9ee..04d40c4ce 100644
--- a/SRT/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
+++ b/SRT/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+<!--
+   - Author: Andrea Orlati
+   - History:
+ 	- 14-08-23 Created
+-->
 
 <ReceiversModeSetup xmlns="urn:schemas-cosylab-com:ReceiversModeSetup:1.0" 
 	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
 	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	
-	Mode="SINGLEDISH"
+	Mode="NORMAL"
 	RFMin="33000.0 33000.0"
 	RFMax="50000.0 50000.0"
 	IFMin="1000.0 1000.0"
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
deleted file mode 100644
index 13732b9ee..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<ReceiversModeSetup xmlns="urn:schemas-cosylab-com:ReceiversModeSetup:1.0" 
-	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	
-	Mode="SINGLEDISH"
-	RFMin="33000.0 33000.0"
-	RFMax="50000.0 50000.0"
-	IFMin="1000.0 1000.0"
-	IFBandwidth="17000.0 17000.0"
-	Feeds="19"
-	IFs="2"
-	Polarization="L R"
-	DefaultLO="16000.0 16000.0"
-	FixedLO2="0.0 0.0"
-	LOMin="16000.0 16000.0"
-	LOMax="16000.0 16000.0"
-/>
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml
deleted file mode 100644
index 6214918d5..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<ReceiversModeSetup xmlns="urn:schemas-cosylab-com:ReceiversModeSetup:1.0" 
-	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	
-	Mode="VLBI"
-	RFMin="33000.0 33000.0"
-	RFMax="50000.0 50000.0"
-	IFMin="1000.0 1000.0"
-	IFBandwidth="17000.0 17000.0"
-	Feeds="19"
-	IFs="2"
-	Polarization="L R"
-	DefaultLO="16000.0 16000.0"
-	FixedLO2="0.0 0.0"
-	LOMin="16000.0 16000.0"
-	LOMax="16000.0 16000.0"
-/>
diff --git a/SRT/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml
similarity index 85%
rename from SRT/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml
rename to SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml
index 6214918d5..04d40c4ce 100644
--- a/SRT/CDB/alma/DataBlock/SRTQBandReceiver/Modes/VLBI/VLBI.xml
+++ b/SRT/Configuration/CDB/alma/DataBlock/SRTQBandReceiver/NormalModeSetup/NormalModeSetup.xml
@@ -1,11 +1,16 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
+<!--
+   - Author: Andrea Orlati
+   - History:
+ 	- 14-08-23 Created
+-->
 
 <ReceiversModeSetup xmlns="urn:schemas-cosylab-com:ReceiversModeSetup:1.0" 
 	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
 	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	
-	Mode="VLBI"
+	Mode="NORMAL"
 	RFMin="33000.0 33000.0"
 	RFMax="50000.0 50000.0"
 	IFMin="1000.0 1000.0"
diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/Boss/Boss.xml b/SRT/Configuration/CDB/alma/RECEIVERS/Boss/Boss.xml
index 4f67761f9..3bddc6693 100644
--- a/SRT/Configuration/CDB/alma/RECEIVERS/Boss/Boss.xml
+++ b/SRT/Configuration/CDB/alma/RECEIVERS/Boss/Boss.xml
@@ -30,6 +30,8 @@
 
 <AvailableReceiver Code="KKG" Derotator="false" Component="RECEIVERS/SRTKBandMFReceiver"/>
 
+<AvailableReceiver Code="QQG" Derotator="false" Component="RECEIVERS/SRTQBandReceiver"/>
+
 <AvailableReceiver Code="LLP" Derotator="false" Component="RECEIVERS/SRTLPBandReceiver"/>
 
 <AvailableReceiver Code="PPP" Derotator="false" Component="RECEIVERS/SRTLPBandReceiver"/>
-- 
GitLab