Commit 3dec011f authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'centos_7_compatibility' of https://github.com/discos/discos into srt-bandQ-receiver

parents a19fc2d4 f98438c6

Common/Clients/CaltoolClient/src/_ctc.py

+2 −2
Original line number Diff line number Diff line
@@ -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"),str(azOffset/math.pi*180))

                self.emit(Qt.SIGNAL("eloffset"),str(elOffset/math.pi*180))

                self.emit(Qt.SIGNAL("azoffset"),f'{azOffset/math.pi*180:.3f}')

                self.emit(Qt.SIGNAL("eloffset"),f'{elOffset/math.pi*180:.3f}')



                rec= self.caltool.isRecording()

                if rec==True:

SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml

+54 −54
Original line number Diff line number Diff line
@@ -3,36 +3,36 @@ 
<Receiver>

	<receiverCode>CCB</receiverCode>

        <phi>90.0</phi>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2957174778 </coefficientVal00>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2928903102 </coefficientVal00>

        <coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0068070539 </coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0016828823 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0009974039 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0006166724 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0852021798 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0925736725 </coefficientVal07>

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0050373901 </coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0004504185 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0004917062 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0013179234 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0518534295 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.1137315109 </coefficientVal07>

        <coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>

        <coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.0148610147 </coefficientVal10>

        <coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0 </coefficientVal11>

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0005418550 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0000714987 </coefficientVal13>

        <coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0 </coefficientVal14>

        <coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0 </coefficientVal15>

        <coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0 </coefficientVal16>

        <coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0 </coefficientVal17>

        <coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0 </coefficientVal18>

        <coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0 </coefficientVal19>

        <coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0 </coefficientVal20>

        <coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0 </coefficientVal21>

        <coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0 </coefficientVal22>

        <coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0 </coefficientVal23>

        <coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0 </coefficientVal24>

        <coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0 </coefficientVal25>

        <coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0 </coefficientVal26>

        <coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0 </coefficientVal27>

        <coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0 </coefficientVal28>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.0103850271 </coefficientVal10>

        <coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> -0.0000271092 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0002547238 </coefficientVal13>

        <coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>

        <coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>

        <coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>

        <coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>

        <coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>

        <coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>

        <coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>

        <coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>

        <coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>

        <coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>

        <coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>

        <coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>

        <coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>

        <coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>

        <coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



<Receiver>
@@ -142,36 +142,36 @@ 
<Receiver>

	<receiverCode>CCG</receiverCode>

        <phi>90.0</phi>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00>-2.2881932258 </coefficientVal00>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2894389629 </coefficientVal00>

        <coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0040601296</coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0014384996  </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0003379379 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0015144897</coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.2964673936 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> -0.1382924467 </coefficientVal07>

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> 0.0002044142 </coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0018049411 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0000764903 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0015140247 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0495181828 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.1174282282 </coefficientVal07>

        <coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>

        <coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> -0.0023407035 </coefficientVal10>

        <coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0 </coefficientVal11>

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0002931280 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0004088043  </coefficientVal13>

        <coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0 </coefficientVal14>

        <coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0 </coefficientVal15>

        <coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0 </coefficientVal16>

        <coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0 </coefficientVal17>

        <coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0 </coefficientVal18>

        <coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0 </coefficientVal19>

        <coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0 </coefficientVal20>

        <coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0 </coefficientVal21>

        <coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0 </coefficientVal22>

        <coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0 </coefficientVal23>

        <coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0 </coefficientVal24>

        <coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0 </coefficientVal25>

        <coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0 </coefficientVal26>

        <coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0 </coefficientVal27>

        <coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0 </coefficientVal28>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.0047037964 </coefficientVal10>

        <coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0004461684 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0008204504 </coefficientVal13>

        <coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>

        <coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>

        <coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>

        <coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>

        <coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>

        <coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>

        <coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>

        <coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>

        <coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>

        <coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>

        <coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>

        <coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>

        <coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>

        <coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>

        <coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



<Receiver>

SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml

+27 −27
Original line number Diff line number Diff line
@@ -142,36 +142,36 @@ 
<Receiver>

	<receiverCode>CCG</receiverCode>

        <phi>90.0</phi>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00>-2.2881932258 </coefficientVal00>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2894389629 </coefficientVal00>

        <coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0040601296</coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0014384996  </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0003379379 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0015144897</coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.2964673936 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> -0.1382924467 </coefficientVal07>

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> 0.0002044142 </coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> 0.0018049411 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0000764903 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0015140247 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0495181828 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.1174282282 </coefficientVal07>

        <coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>

        <coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> -0.0023407035 </coefficientVal10>

        <coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0 </coefficientVal11>

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0002931280 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0004088043  </coefficientVal13>

        <coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0 </coefficientVal14>

        <coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0 </coefficientVal15>

        <coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0 </coefficientVal16>

        <coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0 </coefficientVal17>

        <coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0 </coefficientVal18>

        <coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0 </coefficientVal19>

        <coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0 </coefficientVal20>

        <coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0 </coefficientVal21>

        <coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0 </coefficientVal22>

        <coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0 </coefficientVal23>

        <coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0 </coefficientVal24>

        <coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0 </coefficientVal25>

        <coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0 </coefficientVal26>

        <coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0 </coefficientVal27>

        <coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0 </coefficientVal28>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.0047037964 </coefficientVal10>

        <coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0004461684 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0008204504 </coefficientVal13>

        <coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>

        <coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>

        <coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>

        <coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>

        <coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>

        <coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>

        <coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>

        <coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>

        <coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>

        <coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>

        <coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>

        <coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>

        <coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>

        <coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>

        <coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>

        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



<Receiver>