Commit 6edb4a43 authored by Sergio Poppi's avatar Sergio Poppi
Browse files

LO_LP working

parent 34a23d5d

Common/Servers/PyLocalOscillator/src/LocalOscillatorImpl/CommandLine.py

+8 −5
Original line number Diff line number Diff line
@@ -63,15 +63,18 @@ class CommandLine: 
       cmd= POWERCMD + str(power) + POWERUNIT

 

       try:

           status_send=self.sendCmd(cmd)

           if error_msg != '0,\"No error\"\n': 

                print "exception",error_msg

                raise CommandLineError(error_msg) 

           return statusSend 



           err=self.sendCmd(cmd)

             

           msg=self.query(QUERYERROR)

            

           return msg,err

           

       except socket.error , msg:

          print "connect error: " ,msg

          return msg,False

          self.sock=None

   

   def getPower(self):

       QUERYPOWER="POWER?;SYST:ERR?\n"

       cmd=QUERYPOWER

Common/Servers/PyLocalOscillator/src/LocalOscillatorImpl/LocalOscillator.py

+17 −6
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ class LocalOscillator(Receivers__POA.LocalOscillator, CharacteristicComponent, C 
      CharacteristicComponent.__init__(self)

      ContainerServices.__init__(self)

      self.cl=CommandLine.CommandLine() 



      self.freq=0.

      self.power=0.

#

# ___oOo___

   def cleanUp(self):
@@ -95,19 +96,29 @@ class LocalOscillator(Receivers__POA.LocalOscillator, CharacteristicComponent, C 
       self.cl.configure(IP,PORT)

   

   def set(self,rf_power,rf_freq):

     try:

        self.cl.setPower(rf_power)

        self.cl.setFrequency(rf_freq)

       return 1

        self.freq=rf_freq

        self.power=rf_power

     except CommandLine.CommandLineError,ex :

          

        logger.logError(ex)



       

   

   

   

   

   

   def get(self,rf_power,rf_freq):



   

   def get(self):

     

       msg,power=self.cl.getPower()

       msg,freq= self.cl.getFrequency()



       print power

       print freq

       return (power,freq)

  

   def rfon(self):

Common/Servers/PyLocalOscillator/src/LocalOscillatorImpl/devios.py

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ class frequencyDevIO(DevIO): 
        DevIO.__init__(self,value)

        self.cl=cl

    def read(self):

        self.cl.getFrequency()

        return self.value

        value=self.cl.getFrequency()

        return value



    def write(self, value):

        self.value = value

Common/Servers/PyLocalOscillator/test/test_commandline.py

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class TestCommandLine(unittest2.TestCase): 
         msg,err=self.cl.setPower(13)

         self.assertEqual('0,\"No error\"\n',msg)

         

      @unittest2.skip("demonstrating skipping")      

 #     @unittest2.skip("demonstrating skipping")      

      def test_4_sendPower(self):

         msg,err=self.cl.setPower(13)

         self.assertEqual('0,\"No error\"\n',msg)