pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
sfop
2016-12-16 08:33:18 +01:00
parent bab567fbfd
commit 4f1850787c
7 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Cameras.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.core.Controller;
import ch.psi.pshell.core.Context;
import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
@@ -63,7 +63,7 @@ public class Cameras extends Panel {
public Cameras() {
initComponents();
renderer.setPersistenceFile(Paths.get(getController().getSetup().getContextPath(), "Renderer_Cameras.bin"));
renderer.setPersistenceFile(Paths.get(getContext().getSetup().getContextPath(), "Renderer_Cameras.bin"));
setPersistedComponents(new Component[]{checkCamtool});
comboCameras.setEnabled(false);
if (App.hasArgument("poll")) {
@@ -497,7 +497,7 @@ public class Cameras extends Panel {
}
double[] fitGaussianScript(int[] y, int[] x) {
ScriptManager sm = Controller.getInstance().getScriptManager();
ScriptManager sm = Context.getInstance().getScriptManager();
ArrayProperties pY = ArrayProperties.get(y);
sm.setVar("y", y);
sm.setVar("x", x);

6
plugins/Correlation.java
View File

@@ -66,14 +66,14 @@ public class Correlation extends Panel {
//DecimalFormat formatter = new DecimalFormat("0.##E0");
void updateResults(){
try{
textCorrelation.setText(String.format("%1.4f", Double.valueOf((Double)getController().getInterpreterVariable("corr"))));
textCorrelation.setText(String.format("%1.4f", Double.valueOf((Double)getContext().getInterpreterVariable("corr"))));
} catch (Exception ex){
textCorrelation.setText("");
}
if (checkLinear.isSelected()){
try{
List pars = (List)getController().getInterpreterVariable("pars_lin");
List pars = (List)getContext().getInterpreterVariable("pars_lin");
//textLinear.setText(String.format("%1.3fx%+1.3f", (Double)(pars.get(1)), (Double)(pars.get(0))));
textLinear.setText(String.format("%1.6gx%+1.6g",pars.get(1), pars.get(0)));
} catch (Exception ex){
@@ -83,7 +83,7 @@ public class Correlation extends Panel {
if (checkQuadratic.isSelected()){
try{
List pars = (List)getController().getInterpreterVariable("pars_quad");
List pars = (List)getContext().getInterpreterVariable("pars_quad");
//textQuadratic.setText(String.format("%1.2fx\u00B2 %+1.2fx%+1.2f", (Double)(pars.get(0)), (Double)(pars.get(1)), (Double)(pars.get(0))));
textQuadratic.setText(String.format("%1.3gx\u00B2%+1.3gx%+1.3g", pars.get(0), pars.get(1), pars.get(0)));
//textQuadratic.setText(formatter.format(pars.get(2))+ formatter.format(pars.get(1)) + formatter.format(pars.get(0)));

4
plugins/GunSolenoidAlignment.java
View File

@@ -52,7 +52,7 @@ public class GunSolenoidAlignment extends Panel {
@Override
public void onInitialize(int runCount) {
progressBar.setValue(0);
getController().addScanListener(scanListener);
getContext().addScanListener(scanListener);
centroidPlot.getAxis(Plot.AxisId.X).setLabel("Centroid Excursion");
}
@@ -100,7 +100,7 @@ public class GunSolenoidAlignment extends Panel {
//Add ELOG entry
if (checkElog.isSelected()) {
String file = Paths.get(getController().getSetup().getContextPath(), "CentroidPlot.jpg").toString();
String file = Paths.get(getContext().getSetup().getContextPath(), "CentroidPlot.jpg").toString();
try {
Thread.sleep(250); //Some time to plot update
centroidPlot.saveSnapshot(file , "jpg");

4
plugins/LaserGunAlignment.java
View File

@@ -52,7 +52,7 @@ public class LaserGunAlignment extends Panel {
@Override
public void onInitialize(int runCount) {
progressBar.setValue(0);
getController().addScanListener(scanListener);
getContext().addScanListener(scanListener);
centroidPlot.getAxis(Plot.AxisId.X).setLabel("Centroid Excursion");
}
@@ -99,7 +99,7 @@ public class LaserGunAlignment extends Panel {
hull.setData((double[]) Convert.toDouble(x), (double[]) Convert.toDouble(y));
//Add ELOG entry
if (checkElog.isSelected()) {
String file = Paths.get(getController().getSetup().getContextPath(), "CentroidPlot.jpg").toString();
String file = Paths.get(getContext().getSetup().getContextPath(), "CentroidPlot.jpg").toString();
try {
Thread.sleep(250); //Some time to plot update
centroidPlot.saveSnapshot(file , "jpg");

18
plugins/ScreenPanel.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.core.Controller;
import ch.psi.pshell.core.Context;
import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
@@ -104,7 +104,7 @@ public class ScreenPanel extends Panel {
public ScreenPanel() {
initComponents();
renderer.setPersistenceFile(Paths.get(getController().getSetup().getContextPath(), "Renderer_Cameras.bin"));
renderer.setPersistenceFile(Paths.get(getContext().getSetup().getContextPath(), "Renderer_Cameras.bin"));
setPersistedComponents(new Component[]{buttonCamtool, buttonDirect});
comboCameras.setEnabled(false);
if (App.hasArgument("poll")) {
@@ -943,7 +943,7 @@ public class ScreenPanel extends Panel {
}
double[] fitGaussianScript(int[] y, int[] x) {
ScriptManager sm = Controller.getInstance().getScriptManager();
ScriptManager sm = Context.getInstance().getScriptManager();
ArrayProperties pY = ArrayProperties.get(y);
sm.setVar("y", y);
sm.setVar("x", x);
@@ -2052,21 +2052,21 @@ public class ScreenPanel extends Panel {
private void buttonSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSaveActionPerformed
try {
String snapshotFile = getController().getSetup().expandPath("{images}/snapshot.png");
String snapshotFile = getContext().getSetup().expandPath("{images}/snapshot.png");
renderer.saveSnapshot(snapshotFile, "png", true);
getController().setExecutionContext("snapshot", null, null, null, null, null, null, null);
getController().getDataManager().setDataset("/data", renderer.getData().getMatrix(), renderer.getData().isUnsigned());
getController().getDataManager().closeOutput();
getContext().setExecutionContext("snapshot", null, null, null, null, null, null, null);
getContext().getDataManager().setDataset("/data", renderer.getData().getMatrix(), renderer.getData().isUnsigned());
getContext().getDataManager().closeOutput();
StringBuilder message = new StringBuilder();
message.append("Camera: ").append(cameraName).append(" (").
append((camera instanceof Camtool) ? "camtool" : "direct").append(")").append("\n");
message.append("Data file: ").append(getController().getExecutionContext().getPath()).append("\n");
message.append("Data file: ").append(getContext().getExecutionContext().getPath()).append("\n");
if ((fitOv != null) && (fitOv.length > 3)) {
Overlays.Text text = (Overlays.Text) fitOv[3];
message.append(text.getText()).append("\n");
}
elog("ScreenPanel Snapshot", message.toString(), new String[]{snapshotFile});
SwingUtils.showMessage(getTopLevel(), "Success", "Generated data file:\n" + getController().getExecutionContext().getPath(), 5000);
SwingUtils.showMessage(getTopLevel(), "Success", "Generated data file:\n" + getContext().getExecutionContext().getPath(), 5000);
} catch (Exception ex) {
ex.printStackTrace();

10
script/local.py
View File

@@ -131,7 +131,7 @@ def elog(title, message, attachments = [], author = None, category = "Info", dom
Add entry to ELOG.
"""
if author is None:
author = "pshell" #controller.getUser().name
author = "pshell" #context.getUser().name
typ = "pshell"
entry = ""
@@ -156,7 +156,7 @@ def elog(title, message, attachments = [], author = None, category = "Info", dom
raise Exception(err)
print out
def get_plot_snapshots(title = None, file_type = "png", temp_path = controller.setup.getContextPath()):
def get_plot_snapshots(title = None, file_type = "png", temp_path = context.setup.getContextPath()):
"""
Returns list with file names of plots snapshots from a plotting context.
"""
@@ -184,7 +184,7 @@ center_x.setPolling(100)
center_y.setPolling(100)
if not controller.isLocalMode():
if not context.isLocalMode():
try:
run("camtool")
add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = True, camera = "SINEG01-DSCR190", gauss = False), True)
@@ -255,13 +255,13 @@ avy = create_averager(comy, 5, 0.001)
#CAS
if controller.isServerEnabled():
if context.isServerEnabled():
import ch.psi.pshell.epics.CAS as CAS
#CAS.setServerPort(5062)
class ServerUrl(ReadonlyRegisterBase):
def doRead(self):
return controller.server.baseURL
return context.server.baseURL
d = ServerUrl()
d.initialize()

21
script/test/bs.py
View File

@@ -10,14 +10,25 @@ st1 = Stream("st1", dispatcher)
st1.addScalar("scpu", "SINDI01-RLLE-STA:SLAVE1-CPUTIMER", 10, 0)
st1.addScalar("mcpu", "SINDI01-RLLE-STA:MASTER-CPUTIMER", 10, 0)
st1.addWaveform("amp", "SINDI01-RCIR-PUP10:SIG-AMPLT", 10, 0, 2048)
st1.addWaveform("amp", "SINDI01-RCIR-PUP10:SIG-AMPLT", 10, 0)
st1.initialize()
st1.start(True)
#st1.start(True)
class PseudoPositioner(Writable):
def write(self,pos):
print "Step = " + str(pos)
pseudo_motor = PseudoPositioner()
try:
#Dumps to file all pulse IDs
bscan (st1, 10, title="bscan")
tscan (st1.getReadables(), 10,0.1, title="tscan")
#When sampling the stream waits for next value in normal scans/
#tscan (st1.getReadables(), 10,0.1)
#lscan (pseudo_motor, [gsx,] + st1.getReadables(), 0, 10, 10, latency=0.1)
finally:
st1.close()