Merge

branch 'aleksei_dev'
of http://lm1/quantum_circuits/python_repo into aleksei_dev

unification with remote brunch

QUBEXP/qreadout.py

@@ -158,7 +158,8 @@ class Readout(object):
             self.pars_dict.update({'Downmixer power': dm_power})
 
     def __set_LO(self):
-        freq = np.round(self._rogen.frequency()+self.DM_frequency()*1e-3,10)
+        #freq = np.round(self._rogen.frequency()+self.DM_frequency()*1e-3,10)
+        freq = np.round(self._rogen.frequency(),10)
         self._logen.frequency(freq)
         self._logen.power(self.DM_power())
         self._logen.output(1)