pshell_config/dev
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gobbo_a
2020-06-17 15:26:36 +02:00
parent 0507efad42
commit 5b142242c6
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/devices.properties
View File

@@ -1,3 +1,4 @@
$pol_offset=ch.psi.pshell.epics.ChannelDouble||||false
$det=ch.psi.pshell.epics.AreaDetector|13SIM1|||false
det2=ch.psi.pshell.epics.AreaDetector|CCCC|||
image=ch.psi.pshell.imaging.CameraSource|det||-500|false

4
config/variables.properties
View File

@@ -1,2 +1,2 @@
#Fri Jun 05 16:58:59 CEST 2020
FileSequentialNumber=330
#Wed Jun 17 11:25:33 CEST 2020
FileSequentialNumber=333

19
plugins/HarmonicScan.form
View File

@@ -33,9 +33,9 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel3" max="32767" attributes="0"/>
<Component id="jPanel1" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jPanel3" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
@@ -78,7 +78,7 @@
<Component id="spinnerStep" linkSize="7" min="-2" max="-2" attributes="0"/>
<Component id="spinnerEnergy" linkSize="7" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="9" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -149,13 +149,12 @@
<Component class="javax.swing.JComboBox" name="comboPolarizarion">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="6">
<StringArray count="5">
<StringItem index="0" value="Manual"/>
<StringItem index="1" value="Circ+"/>
<StringItem index="2" value="Circ-"/>
<StringItem index="3" value="LinV"/>
<StringItem index="4" value="LinH"/>
<StringItem index="5" value=" "/>
<StringItem index="1" value="CIRC +"/>
<StringItem index="2" value="CIRC -"/>
<StringItem index="3" value="LINEAR H"/>
<StringItem index="4" value="LINEAR V"/>
</StringArray>
</Property>
</Properties>

14
plugins/HarmonicScan.java
View File

@@ -80,8 +80,8 @@ public class HarmonicScan extends Panel {
String selection = comboSetup.getSelectedItem().toString();
String val = prop.getProperty(selection);
String[] tokens = val.split(" ");
if (tokens.length != 8) {
throw new Exception("Invalid file format");
if (tokens.length != 1) {
throw new Exception("Invalid file format: " + tokens.length);
}
spinnerEnergy.setValue(Double.valueOf(tokens[0].trim()));
}
@@ -105,7 +105,7 @@ public class HarmonicScan extends Panel {
args.put("ID_ENERGY", (Double) spinnerEnergy.getValue());
args.put("HALFWIDTH", (Double) spinnerHalfwidth.getValue());
args.put("STEP", (Double) spinnerStep.getValue());
args.put("POLARIZATION ", comboPolarizarion.getSelectedItem().toString());
args.put("MODE ", comboPolarizarion.getSelectedItem().toString());
runAsync("HarmonicScan", args);
}
@@ -151,7 +151,7 @@ public class HarmonicScan extends Panel {
jLabel11.setText("Polarization:");
comboPolarizarion.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Manual", "Circ+", "Circ-", "LinV", "LinH", " " }));
comboPolarizarion.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Manual", "CIRC +", "CIRC -", "LINEAR H", "LINEAR V" }));
jLabel1.setText("Energy");
@@ -189,7 +189,7 @@ public class HarmonicScan extends Panel {
.addComponent(spinnerHalfwidth, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(spinnerStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(spinnerEnergy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(9, Short.MAX_VALUE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonConfigure, comboPolarizarion, comboSetup});
@@ -274,9 +274,9 @@ public class HarmonicScan extends Panel {
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents

2
script/HarmonicScan.py
View File

@@ -37,7 +37,7 @@ try:
sleep( 0.3 ) # Settling time
#ret = lscan(energy, [signal_i0, signal_tey, 'ca://X07MA-PC-K428:2:getTotalGain', 'ca://X07MA-ID:MODE?type=d', pol_angle, current, energy, pol_offset, 'ca://X07MA-ID-GAP:READ','ca://X07MA-ID-SHIFT:READ'], ID_ENERGY-HALFWIDTH, ID_ENERGY+HALFWIDTH, STEP, before_read = before)
ret = lscan(energy, [signal_i0, signal_tey, 'ca://X07MA-PC-K428:2:getTotalGain', energy], ID_ENERGY-HALFWIDTH, ID_ENERGY+HALFWIDTH, STEP, before_read = before)
ret = lscan(energy, sensors, ID_ENERGY-HALFWIDTH, ID_ENERGY+HALFWIDTH, STEP, before_read = before)
xdata = ret.getPositions(0)
ydata = ret.getReadable(0)
ymin = min(ydata)