etc/tcs_iif/ltcs.iif-dev.cfg

@@ -6,7 +6,7 @@ CONNECTION.TIMEOUT:Time                = 00:00:05.000000      +UNIT=hour
 # INSTRUMENT_ID                        = "LBTI"
 
 # ###### NEW SIMULATOR OR REAL TELESCOPE
-PROXY_NAME                             = "SHARKNIRWS"
+PROXY_NAME                             = "SHARKNIRWS1"
 INSTRUMENT_ID                          = "SHARK"
 
 

src/obs_ctrl/sequencerI.cpp

@@ -1796,6 +1796,11 @@ Ice::Int SequencerI::RTCTTTeccamExpose(const sharknir::dictDetSetup &_dTechCamSe
     IceCallCounter callCounter(m_IceCallMutex, m_IceCallCounter);
     U6_LLOG(__FUNCTION__ << " ~ IceCallCounter : " << callCounter.getCounter());
     Ice::Int status = EXIT_FAILURE;
+    std::map<std::string, std::string>::const_iterator itSetup;
+    for(itSetup = _dTechCamSetup.begin(); itSetup != _dTechCamSetup.end(); itSetup++)
+    {
+        U9_LLOG("Keyword : " << std::setfill('_') << std::setw(20) << itSetup->first << "; Value : " << std::setw(70) << itSetup->second);
+    }
     try
     {
         CheckTipTilt();
@@ -2622,6 +2627,11 @@ Ice::Int SequencerI::sashaSetup(const dictDetSetup &_dSashaSetup, const Ice::Cur
     IceCallCounter callCounter(m_IceCallMutex, m_IceCallCounter);
     U6_LLOG(__FUNCTION__ << " ~ IceCallCounter : " << callCounter.getCounter());
     Ice::Int status = EXIT_FAILURE;
+    std::map<std::string, std::string>::const_iterator itSetup;
+    for(itSetup = _dSashaSetup.begin(); itSetup != _dSashaSetup.end(); itSetup++)
+    {
+        U9_LLOG("Keyword : " << std::setfill('_') << std::setw(20) << itSetup->first << "; Value : " << std::setw(70) << itSetup->second);
+    }
     try
     {
         status = m_seqDataMgr->sashaSetup(_dSashaSetup);

src/scripts/templates/ob/SHARKNIR_gen_base.xml

@@ -11,10 +11,10 @@
     <TPLName>Generic Target Acquisition</TPLName>
     
     <!-- <InfoSetup> -->
-    <!--   <OBJECT>Oggetto</OBJECT> -->
-    <!--   <COMMENT>Observer Comment</COMMENT> -->
-    <!--   <PARTNER>PARTNER</PARTNER> -->
-    <!--   <OBSERVER>Galileo Galilei</OBSERVER> -->
+    <!--   <OBJECT> </OBJECT> -->
+    <!--   <COMMENT></COMMENT> -->
+    <!--   <PARTNER> </PARTNER> -->
+    <!--   <OBSERVER></OBSERVER> -->
     <!--   <PI_COI> </PI_COI> -->
     <!--   <PROPID> </PROPID> -->
     <!-- </InfoSetup> -->

src/scripts/templates/tpl/shinsapp.py

@@ -213,12 +213,12 @@ class SHINSApp(object):
                 for element, value in info_s.items():
                     logger.info("{:>22} : {:<22}".format(element, str(value)))
                 self.obsController.setContext(info_s) #Passing info to OS , not to template script
-            else:
-                keys = ["OBJECT", "OBSERVER", "PARTNER", "COMMENT", "PROPID", "PI_COI"]
-                info_s = {}
-                for k in keys:
-                    info_s[k] = ""
-                self.obsController.setContext(info_s) #Passing info to OS , not to template script
+            # else:
+            #     keys = ["OBJECT", "OBSERVER", "PARTNER", "COMMENT", "PROPID", "PI_COI"]
+            #     info_s = {}
+            #     for k in keys:
+            #         info_s[k] = ""
+            #     self.obsController.setContext(info_s) #Passing info to OS , not to template script
             if ins_s:
                 logger.info("Instrument Setup")
                 for element, value in ins_s.items():

src/tiptilt_ctrl/bcu/util/rtcSlopeComputer.cpp

@@ -679,7 +679,7 @@ void rtcSlopeComputer::generate_pointlike_gain(int sizex, int sizey, float cx, f
     m_pixelGain.resize(m_det.get_slope_pixels_number());
     float CX = ((int)(cx*2))/2.f;
     float CY = ((int)(cy*2))/2.f;
-    U9_LLOG("PointLike Gain : (" << sizex << ", " << sizey << ", " << CX << ", " << CY << ")");
+    U9_LLOG("PointLike Gain : (" << sizex << ", " << sizey << ", " << CX << ", " << CY << ", " << radius << ", " << amplitude << ")");
     if(sizex*sizey == m_det.get_slope_pixels_number())
     {
         for(i = 0; i < sizey; i++)