diff --git a/config/plugins.properties b/config/plugins.properties index f373de7b..b98e0a6f 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,4 +1,4 @@ -ManipulatorScan.java=enabled -HoloScan.java=enabled XPSSpectrum.java=enabled +HoloScan.java=enabled PhotonEnergy.java=enabled +ManipulatorScan.java=enabled diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form index 145452f4..aaf7ae67 100644 --- a/plugins/HoloScan.form +++ b/plugins/HoloScan.form @@ -24,7 +24,7 @@ - + @@ -374,7 +374,7 @@ - + diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java index ee87d454..1dcf185d 100644 --- a/plugins/HoloScan.java +++ b/plugins/HoloScan.java @@ -406,7 +406,7 @@ public class HoloScan extends Panel { .addComponent(checkCur2) .addComponent(checkCur3) .addComponent(checkAngleDistribution)) - .addGap(0, 6, Short.MAX_VALUE))) + .addGap(0, 0, 0))) .addContainerGap()) ); panelSensorsLayout.setVerticalGroup( @@ -487,7 +487,7 @@ public class HoloScan extends Panel { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(panelSensors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(panelSensors, javax.swing.GroupLayout.PREFERRED_SIZE, 233, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(panelPhi, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) @@ -495,7 +495,7 @@ public class HoloScan extends Panel { .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPhi, panelSensors}); + layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPhi}); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form index 2ef249bc..7bdac1b2 100644 --- a/plugins/ManipulatorScan.form +++ b/plugins/ManipulatorScan.form @@ -24,7 +24,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -362,7 +362,7 @@ - + diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java index cffc9bae..f15b4c54 100644 --- a/plugins/ManipulatorScan.java +++ b/plugins/ManipulatorScan.java @@ -404,7 +404,7 @@ public class ManipulatorScan extends Panel { .addGroup(panelSensorsLayout.createSequentialGroup() .addContainerGap() .addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE) + .addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(panelSensorsLayout.createSequentialGroup() .addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(checkImage) @@ -420,7 +420,7 @@ public class ManipulatorScan extends Panel { .addComponent(checkCur2) .addComponent(checkCur3) .addComponent(checkAngleDistribution)) - .addGap(0, 0, Short.MAX_VALUE))) + .addGap(0, 0, 0))) .addContainerGap()) ); panelSensorsLayout.setVerticalGroup( @@ -508,7 +508,7 @@ public class ManipulatorScan extends Panel { .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner, panelSensors}); + layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner}); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form index f710b6ca..61ec3bea 100644 --- a/plugins/PhotonEnergy.form +++ b/plugins/PhotonEnergy.form @@ -24,7 +24,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -373,7 +373,7 @@ - + diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java index 4dc652ac..91967e8f 100644 --- a/plugins/PhotonEnergy.java +++ b/plugins/PhotonEnergy.java @@ -478,7 +478,7 @@ public class PhotonEnergy extends Panel { .addGroup(panelSensorsLayout.createSequentialGroup() .addContainerGap() .addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE) + .addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(panelSensorsLayout.createSequentialGroup() .addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(checkImage) @@ -494,7 +494,7 @@ public class PhotonEnergy extends Panel { .addComponent(checkCur2) .addComponent(checkCur3) .addComponent(checkAngleDistribution)) - .addGap(0, 0, Short.MAX_VALUE))) + .addGap(0, 0, 0))) .addContainerGap()) ); panelSensorsLayout.setVerticalGroup( @@ -582,7 +582,7 @@ public class PhotonEnergy extends Panel { .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner, panelSensors}); + layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner}); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index b7a3c8f9..7126c413 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -19,9 +19,12 @@ set_adc_averaging() if len(VECTOR[0]) == 2: #FIXED writables = (Eph, Scienta.centerEnergy) + Scienta.centerEnergy.write(VECTOR[0][1]) #in order scaling of image based on first point else: #SWEPT writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy) + Scienta.lowEnergy.write(VECTOR[0][1]) + Scienta.highEnergy.write(VECTOR[0][2]) set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = after_readout) diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index a9a6ace0..9dde9090 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -8,7 +8,7 @@ from ch.psi.pshell.data.LayoutDefault import ATTR_WRITABLE_DIMENSION as ATTR_WRI cur_range = 0 cur_iteration = 0 -if Scienta.acquisitionMode == Scienta.AcquisitionMode.Fixed: +if Scienta.acquisitionMode != Scienta.AcquisitionMode.Swept: Scienta.acquisitionMode = Scienta.AcquisitionMode.Swept ret=[] @@ -17,15 +17,15 @@ ret=[] Scienta.passEnergy = pass_energy names=[] +names.append("Online Spectrum") for i in range(len(ranges)): names.append(str(ranges[i])) -names.append("Spectrum") plots = plot(None, names) -spectrum_series = plots[len(names)-1].getSeries(0) +spectrum_series = plots[0].getSeries(0) def plot_cur_spectrum(): global spectrum_series try: - while True: + while controller.state.running: y = Scienta.spectrum.take(100) x = Scienta.spectrumX spectrum_series.setData(x, y) @@ -55,7 +55,7 @@ try: task = fork(plot_cur_spectrum) for cur_iteration in range(vars[2]): - plots[cur_range].setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1)) + plots[cur_range+1].setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1)) trig_scienta() spectrum_array = Scienta.spectrum.read() if ydata is None: @@ -65,11 +65,11 @@ try: ydata[k] = ydata[k] + spectrum_array[k] if xdata is None: xdata = Scienta.spectrumX - plots[cur_range].getSeries(0).setData(xdata, ydata) + plots[cur_range+1].getSeries(0).setData(xdata, ydata) if skip_iteration: break - plots[cur_range].setTitle(str(ranges[cur_range])) + plots[cur_range+1].setTitle(str(ranges[cur_range])) ret.append((xdata, ydata)) data1d = [1,2,3,4,5] @@ -91,7 +91,7 @@ try: finally: - cur_range = 0 + cur_range = -1 if not Scienta.isReady(): Scienta.stop() Scienta.update()