Bug Fixes

Davis · Davis · commit 3b56f3a3f976 · 2019-08-28T17:06:36.000-04:00
diff --git a/ProberControl/config/ProberConfig.conf b/ProberControl/config/ProberConfig.conf
@@ -1 +1,17 @@
+## Object Type
+M
+#O Model
+Keysight8164B_Laser
+#Address
+GPIB0::1::INSTR
+##
 
+## Object Type
+M
+#O Model
+Keysight8164B_PowerMeter
+#Address
+GPIB0::1::INSTR
+#Numbering of Channels
+1:1;2:2
+##
diff --git a/ProberControl/prober/instruments/Keysight8164B_Laser.py b/ProberControl/prober/instruments/Keysight8164B_Laser.py
@@ -293,7 +293,7 @@ def sweepWavelengthsManual(self, start, end, step):
             print ('Specified Wavelengths Out of Range, or Step Too Low')
 
         else:
-            self.gpib.write('SOURCE0:CHAN1:WAV:SWE:MODE:Manual')
+            self.gpib.write('SOURCE0:CHAN1:WAV:SWE:MODE MAN')
             self.gpib.write('SOURCE0:CHAN1:WAV:SWE:STAR ' + str(start) + 'NM')
             self.gpib.write('SOURCE0:CHAN1:WAV:SWE:STOP ' + str(end) + 'NM')
             self.gpib.write('SOURCE0:CHAN1:WAV:SWE:STEP ' + str(step) + 'NM')
diff --git a/ProberControl/prober/instruments/Keysight8164B_PowerMeter.py b/ProberControl/prober/instruments/Keysight8164B_PowerMeter.py
@@ -90,7 +90,7 @@ def prep_measure_on_trigger(self, samples = 64):
 			self.gpib.write('sens'+str(int(self.__channel))+':chan'+str(int(self.__port))+':func:stat logg,stop') #switch stab with logg depending
 			self.gpib.write('trig'+str(int(self.__channel))+':chan'+str(int(self.__port))+':inp sme') #Set up trigger
 			print self.gpib.query('trig'+str(int(self.__channel))+':inp?')
-			self.gpib.write('sens'+str(int(self.__channel))+':chan'+str(int(self.__port))+':func:par:logg '+str(samples)+',100ms')
+			self.gpib.write('sens'+str(int(self.__channel))+':chan'+str(int(self.__port))+':func:par:logg '+str(samples)+',100us')
 			print self.gpib.query('sens'+str(int(self.__channel))+':chan'+str(int(self.__port))+':func:par:logg?')
 			self.gpib.write('sens'+str(int(self.__channel))+':chan'+str(int(self.__port))+':func:stat logg,start')
 
@@ -110,7 +110,7 @@ def get_result_from_log(self,samples=64):
 
         samples = int(samples)
 
-        print data
+        #print data
 
         NofDigits = int(data[1])
 
@@ -121,11 +121,11 @@ def get_result_from_log(self,samples=64):
         for x in range(0, samples*4-1,4):
             dat = HexData[x:x+4]
             val = struct.unpack('<f', struct.pack('4c', *dat))[0]
-            print val
+            #print val
             FloData.append(val)
 
         self.gpib.write('trig'+str(int(self.__channel))+':inp:rearm on')
-        print FloData
+        #print FloData
         return FloData[1:]
 		
     def reset(self):
diff --git a/ProberControl/prober/procedures/Measure.py b/ProberControl/prober/procedures/Measure.py
@@ -110,7 +110,7 @@ def get_o_spectrum_triggered_PowerMeter(maitre,start, stop, step, channels = 1,
     			DataList.append([start+j*step, power])
     		#DataList.append([start+j*step, PowerList[j]])
     	pl = NBPlot()
-    	pl.plot(DataList,'Optical Spectrum for Channel ' + str(i),'Wavelength [nm]','Measured Power [dBm]')
+    	pl.plot(DataList,'Optical Spectrum for Channel ' + str(i+1),'Wavelength [nm]','Measured Power [dBm]')
 
     	AllDataList.append(DataList)
 
