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
2017-04-28 09:07:53 +02:00
parent d4b068b531
commit fa38dd105a
6 changed files with 170 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/CurrentCamera.properties
+9 -9
View File
@@ -1,13 +1,13 @@
#Wed Apr 26 17:50:35 CEST 2017
#Fri Apr 28 08:09:58 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapMax=0.0
colormapAutomatic=false
colormapMax=372.0
colormapMin=0.0
flipHorizontally=false
flipVertically=false
grayscale=false
imageHeight=1024
imageWidth=1280
imageHeight=2160
imageWidth=2560
invert=false
regionStartX=1
regionStartY=1
@@ -21,9 +21,9 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=-640.5003909304144
spatialCalOffsetY=-512.5004887585533
spatialCalScaleX=-8.4375
spatialCalScaleY=-8.49609375
spatialCalOffsetX=-1038.4850588526797
spatialCalOffsetY=-469.50758047873336
spatialCalScaleX=-8.51063859886098
spatialCalScaleY=-8.23581685648336
spatialCalUnits=mm
transpose=false
plugins/WireScan.form
+42 -41
View File
@@ -34,33 +34,6 @@
<EmptySpace max="32767" attributes="0"/>
<Component id="buttonAbort" linkSize="2" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel11" linkSize="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel13" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel14" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="panelPosition" linkSize="4" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
<Component id="labelPosX" linkSize="4" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
<Component id="labelPosY" linkSize="4" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="jLabel12" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="ledHomed" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="buttonHoming" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScannerPanel" linkSize="3" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="buttonMotorPanel" linkSize="3" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
@@ -105,17 +78,42 @@
</Group>
</Group>
<Group type="102" attributes="0">
<Component id="spinnerStartY" linkSize="8" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="spinnerStartY" linkSize="8" max="32767" attributes="0"/>
<Component id="panelStatus" min="-2" pref="324" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="panelStatus" pref="0" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jLabel15" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Component id="panelPosition1" min="-2" pref="72" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jLabel15" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel11" linkSize="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel13" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel14" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="panelPosition" linkSize="4" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
<Component id="labelPosX" linkSize="4" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
<Component id="labelPosY" linkSize="4" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="panelPosition1" linkSize="4" min="-2" pref="92" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel12" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="ledHomed" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="buttonHoming" max="32767" attributes="0"/>
<Component id="buttonScannerPanel" linkSize="3" alignment="0" max="32767" attributes="0"/>
<Component id="buttonMotorPanel" linkSize="3" alignment="0" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
<Component id="jLabel8" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -181,19 +179,16 @@
<Component id="comboBpm3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="32767" attributes="0"/>
<EmptySpace type="separate" pref="24" max="32767" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel11" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="panelPosition" linkSize="5" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonScannerPanel" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel12" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="ledHomed" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel13" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="labelPosX" linkSize="5" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonHoming" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonMotorPanel" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -201,14 +196,20 @@
<Component id="jLabel14" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="labelPosY" linkSize="5" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel15" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="panelPosition1" linkSize="11" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel12" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="ledHomed" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonHoming" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel10" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="panelStatus" linkSize="11" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="panelPosition1" linkSize="11" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel15" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="32767" attributes="0"/>
<EmptySpace type="separate" pref="24" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="buttonAbort" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonScan" alignment="3" min="-2" max="-2" attributes="0"/>
plugins/WireScan.java
+42 -39
View File
@@ -472,27 +472,6 @@ public class WireScan extends Panel {
.addComponent(buttonScan)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel11)
.addComponent(jLabel13)
.addComponent(jLabel14))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelPosition, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelPosX, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelPosY, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel12)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(ledHomed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(buttonHoming))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScannerPanel, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(buttonMotorPanel, javax.swing.GroupLayout.Alignment.TRAILING)))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
@@ -529,14 +508,33 @@ public class WireScan extends Panel {
.addComponent(spinnerEndX, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(spinnerEndY, javax.swing.GroupLayout.Alignment.TRAILING)))
.addGroup(layout.createSequentialGroup()
.addComponent(spinnerStartY)
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jLabel15)
.addGap(4, 4, 4)
.addComponent(panelPosition1, javax.swing.GroupLayout.PREFERRED_SIZE, 72, javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(spinnerStartY)
.addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE))))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel15)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel11)
.addComponent(jLabel13)
.addComponent(jLabel14)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelPosition, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelPosX, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelPosY, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(layout.createSequentialGroup()
.addComponent(panelPosition1, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(jLabel12)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(ledHomed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGap(18, 18, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(buttonHoming, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonScannerPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonMotorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
.addComponent(jLabel8))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE)
@@ -549,7 +547,7 @@ public class WireScan extends Panel {
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonMotorPanel, buttonScannerPanel});
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {labelPosX, labelPosY, panelPosition});
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {labelPosX, labelPosY, panelPosition, panelPosition1});
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerCycles, spinnerEndX, spinnerEndY});
@@ -600,30 +598,32 @@ public class WireScan extends Panel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(comboBpm3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel5))
.addGap(18, 18, Short.MAX_VALUE)
.addGap(18, 24, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel11)
.addComponent(panelPosition, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonScannerPanel)
.addComponent(jLabel12)
.addComponent(ledHomed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(buttonScannerPanel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel13)
.addComponent(labelPosX)
.addComponent(buttonHoming)
.addComponent(buttonMotorPanel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel14)
.addComponent(labelPosY))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel15)
.addComponent(panelPosition1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel12)
.addComponent(ledHomed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonHoming))
.addGap(18, 18, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel10)
.addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(panelPosition1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel15))
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(panelStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 24, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonAbort)
.addComponent(buttonScan)
@@ -733,6 +733,9 @@ public class WireScan extends Panel {
}
}
parameters.add(bpms);
ArrayList blms = new ArrayList();
parameters.add(blms);
getContext().addScanListener(scanListener);
try {
runAsync("Diagnostics/WireScan", parameters).handle((ret, ex) -> {
script/Devices/Elements.py
+72 -5
View File
@@ -1,5 +1,6 @@
DBPM = 1
DWSC = 2
DBLM = 3
elements = (
(DBPM, "SINEG01-DBPM340", 3.0149),
@@ -7,7 +8,9 @@ elements = (
(DBPM, "SINSB02-DBPM150", 12.9489),
(DBPM, "SINLH01-DBPM060", 14.5560),
(DBPM, "SINLH02-DBPM210", 16.4806),
(DBLM, "SINLH02-DBLM230", 16.8546),
(DBPM, "SINLH02-DBPM240", 17.4826),
(DBLM, "SINLH02-DBLM235", 17.4049),
(DBPM, "SINLH03-DBPM010", 19.2172),
(DBPM, "SINLH03-DBPM050", 20.4632),
(DBPM, "SINLH03-DBPM090", 21.6002),
@@ -28,34 +31,42 @@ elements = (
(DBPM, "SINDI01-DBPM060", 83.5117),
(DWSC, "SINDI01-DWSC090", 84.2537),
(DBPM, "SINDI02-DBPM010", 86.0767),
(DBLM, "SINDI02-DBLM025", 86.862),
(DBPM, "SINDI02-DBPM040", 88.3857),
(DBPM, "SINDI02-DBPM080", 90.6297),
(DBLM, "SINDI02-DBLM085", 90.7796),
(DBPM, "S10CB01-DBPM220", 95.3947),
(DBPM, "S10CB01-DBPM420", 100.2947),
(DBPM, "S10CB02-DBPM220", 105.1947),
(DBPM, "S10CB02-DBPM420", 110.0947),
(DWSC, "S10DI01-DWSC010", 110.8237),
(DBLM, "S10DI01-DBLM045", 111.67),
(DBLM, "S10DI01-DBLM015", 113.632),
(DBPM, "S10BD01-DBPM020", 114.6628),
(DBPM, "S10DI01-DBPM110", 114.9947),
(DBPM, "S10CB03-DBPM220", 119.8947),
(DBPM, "S10CB03-DBPM420", 124.7947),
(DWSC, "S10CB03-DWSC440", 125.2127),
(DBPM, "S10CB04-DBPM220", 129.6947),
(DBLM, "S10CB04-DBLM240", 130.1525),
(DBPM, "S10CB04-DBPM420", 134.5947),
(DBPM, "S10CB05-DBPM220", 139.4947),
(DBPM, "S10CB05-DBPM420", 144.3947),
(DWSC, "S10CB05-DWSC440", 144.8127),
(DBPM, "S10CB06-DBPM220", 149.2947),
(DBLM, "S10CB06-DBLM240", 149.7525),
(DBPM, "S10CB06-DBPM420", 154.1947),
(DBPM, "S10CB07-DBPM220", 159.0947),
(DBPM, "S10CB07-DBPM420", 163.9947),
(DWSC, "S10CB07-DWSC440", 164.4127),
(DBPM, "S10CB08-DBPM220", 168.8947),
(DBLM, "S10CB08-DBLM240", 169.3525),
(DBPM, "S10CB08-DBPM420", 173.7947),
(DBPM, "S10CB09-DBPM220", 178.6947),
(DBPM, "S10BC01-DBPM010", 183.5947),
(DWSC, "S10BC01-DWSC030", 184.0127),
(DBPM, "S10BC01-DBPM050", 187.8307),
(DBLM, "S10BC01-DBLM065", 188.684),
(DBPM, "S10BC01-DBPM090", 192.2847),
(DBPM, "S10BC02-DBPM140", 196.7798),
(DBPM, "S10BC02-DBPM320", 206.5399),
@@ -65,22 +76,26 @@ elements = (
(DBPM, "S20CB01-DBPM420", 229.0850),
(DWSC, "S20CB01-DWSC440", 229.5030),
(DBPM, "S20CB02-DBPM420", 238.1850),
(DBLM, "S20CB02-DBLM435", 238.6325),
(DBPM, "S20CB03-DBPM420", 247.2850),
(DBPM, "S20SY01-DBPM010", 256.3850),
(DBPM, "S20SY01-DBPM040", 262.5020),
(DBPM, "S20SY01-DBPM060", 263.6280),
(DWSC, "S20SY01-DWSC070", 263.8280),
(DBLM, "S20SY02-DBLM075", 268.617),
(DBPM, "S20SY02-DBPM080", 269.1300),
(DBPM, "S20SY02-DBPM120", 271.0800),
(DBPM, "S20SY02-DBPM150", 272.7600),
(DWSC, "S20SY02-DWSC160", 273.1350),
(DBPM, "SATSY01-DBPM010", 279.1202),
(DBPM, "S20SY03-DBPM010", 280.6200),
(DBLM, "S20SY03-DBLM025", 281.156),
(DBPM, "SATSY01-DBPM060", 284.6202),
(DBPM, "S20SY03-DBPM040", 286.9200),
(DBPM, "SATSY01-DBPM100", 288.9352),
(DBPM, "S20SY03-DBPM080", 294.3800),
(DWSC, "S20SY03-DWSC090", 294.5800),
(DWSC, "S20SY03-DWSC090", 294.5800),
(DBLM, "S20SY03-DBLM110", 295.258),
(DBPM, "SATSY01-DBPM240", 296.1202),
(DBPM, "SATSY01-DBPM290", 302.8202),
(DBPM, "S30CB01-DBPM420", 303.8150),
@@ -88,6 +103,7 @@ elements = (
(DBPM, "SATSY02-DBPM020", 306.8663),
(DBPM, "SATSY02-DBPM210", 312.6833),
(DBPM, "S30CB02-DBPM420", 312.9150),
(DBLM, "S30CB02-DBLM445", 313.3625),
(DBPM, "SATSY03-DBPM030", 317.2003),
(DBPM, "SATSY03-DBPM060", 320.0003),
(DBPM, "S30CB03-DBPM420", 322.0150),
@@ -95,6 +111,7 @@ elements = (
(DWSC, "SATSY03-DWSC110", 325.1663),
(DBPM, "SATSY03-DBPM120", 325.6003),
(DBPM, "S30CB04-DBPM420", 331.1150),
(DBLM, "SATCL01-DBLM135", 331.1179),
(DBPM, "SATCL01-DBPM140", 331.9185),
(DBPM, "S30CB05-DBPM420", 340.2150),
(DWSC, "S30CB05-DWSC440", 340.6330),
@@ -103,12 +120,15 @@ elements = (
(DWSC, "SATDI01-DWSC065", 342.9837),
(DBPM, "SATDI01-DBPM210", 349.2197),
(DBPM, "S30CB06-DBPM420", 349.3150),
(DBLM, "S30CB06-DBLM445", 349.7625),
(DBLM, "SATDI01-DBLM225", 349.5613),
(DBPM, "SATDI01-DBPM240", 352.1997),
(DBPM, "SATDI01-DBPM270", 355.1797),
(DWSC, "SATDI01-DWSC290", 356.4797),
(DBPM, "SATDI01-DBPM320", 357.0907),
(DBPM, "S30CB07-DBPM420", 358.4150),
(DBPM, "SATCB01-DBPM220", 361.5357),
(DBLM, "SATCB01-DBLM245", 361.8578),
(DBPM, "SATCB01-DBPM420", 366.4357),
(DBPM, "S30CB08-DBPM420", 367.5150),
(DBPM, "S30CB09-DBPM420", 376.6150),
@@ -116,12 +136,15 @@ elements = (
(DBPM, "SATMA01-DBPM010", 377.2657),
(DBPM, "SATMA01-DBPM020", 379.3147),
(DBPM, "SATMA01-DBPM040", 381.3637),
(DBLM, "SATMA01-DBLM065", 381.6948),
(DBPM, "S30CB10-DBPM420", 385.7150),
(DBLM, "S30CB10-DBLM445", 386.271),
(DBPM, "S30CB11-DBPM420", 394.8150),
(DBPM, "S30CB12-DBPM420", 403.9150),
(DBPM, "S30CB13-DBPM420", 413.0150),
(DWSC, "S30CB13-DWSC440", 413.4330),
(DBPM, "S30CB14-DBPM420", 422.1150),
(DBLM, "S30CB14-DBLM445", 422.691),
(DBPM, "S30CB15-DBPM420", 431.2150),
(DBPM, "SARCL01-DBPM010", 440.3150),
(DBPM, "SARCL01-DBPM060", 444.6750),
@@ -129,10 +152,12 @@ elements = (
(DBPM, "SARCL01-DBPM150", 452.1510),
(DWSC, "SARCL01-DWSC160", 452.3510),
(DBPM, "SARCL02-DBPM110", 456.9100),
(DBLM, "SARCL02-DBLM135", 457.9854),
(DBPM, "SARCL02-DBPM220", 460.9609),
(DBPM, "SARCL02-DBPM260", 462.7569),
(DWSC, "SARCL02-DWSC270", 462.9769),
(DBPM, "SARCL02-DBPM330", 466.6909),
(DBLM, "SARCL02-DBLM355", 467.686),
(DBPM, "SARCL02-DBPM470", 471.1067),
(DBPM, "SARMA01-DBPM040", 476.4267),
(DBPM, "SARMA01-DBPM100", 483.2767),
@@ -141,26 +166,42 @@ elements = (
(DBPM, "SARMA02-DBPM040", 492.0597),
(DWSC, "SARMA02-DWSC060", 492.3767),
(DBPM, "SARMA02-DBPM110", 496.8097),
(DBLM, "SARUN01-DBLM065", 497.8392),
(DBPM, "SARUN01-DBPM070", 501.5597),
(DBPM, "SARUN02-DBPM070", 506.3097),
(DBLM, "SARUN03-DBLM030", 506.671),
(DBPM, "SARUN03-DBPM070", 511.0597),
(DBLM, "SARUN04-DBLM030", 511.421),
(DBPM, "SARUN04-DBPM070", 515.8097),
(DBLM, "SARUN05-DBLM030", 516.171),
(DBPM, "SARUN05-DBPM070", 520.5597),
(DBLM, "SARUN06-DBLM030", 520.921),
(DBPM, "SARUN06-DBPM070", 525.3097),
(DBLM, "SARUN07-DBLM030", 525.671),
(DBPM, "SARUN07-DBPM070", 530.0597),
(DBLM, "SARUN08-DBLM030", 530.421),
(DBPM, "SARUN08-DBPM070", 534.8097),
(DBLM, "SARUN09-DBLM030", 535.171),
(DBPM, "SARUN09-DBPM070", 539.5597),
(DBLM, "SARUN10-DBLM030", 539.921),
(DBPM, "SARUN10-DBPM070", 544.3097),
(DBLM, "SARUN11-DBLM030", 544.671),
(DBPM, "SARUN11-DBPM070", 549.0597),
(DBLM, "SARUN12-DBLM030", 549.421),
(DBPM, "SARUN12-DBPM070", 553.8097),
(DBLM, "SARUN13-DBLM030", 554.171),
(DBPM, "SARUN13-DBPM070", 558.5597),
(DBLM, "SARUN14-DBLM030", 558.921),
(DBPM, "SARUN14-DBPM070", 563.3097),
(DBLM, "SARUN15-DBLM030", 563.671),
(DBLM, "SARUN15-DBLM035", 567.970985),
(DBPM, "SARUN15-DBPM070", 568.0597),
(DBPM, "SARUN16-DBPM070", 572.8097),
(DBPM, "SARUN17-DBPM070", 577.5597),
(DBPM, "SARUN18-DBPM070", 582.3097),
(DBPM, "SARUN19-DBPM070", 587.0597),
(DWSC, "SARUN20-DWSC010", 587.3767),
(DBLM, "SARUN20-DBLM035", 590.41),
(DBPM, "SARUN20-DBPM070", 591.8097),
(DBPM, "SARBD01-DBPM040", 593.9132),
(DBPM, "SARBD02-DBPM010", 596.9584),
@@ -177,7 +218,20 @@ def get_section_type(element):
if section == "IN": return "INJECTOR"
if section in["10", "20", "30"] : return "LINAC"
return None
def get_beamline(element):
section = get_section(element)
if section == "AR": return "ARAMIS"
if section == "AT": return "ATH0S"
return None
def get_blms():
ret = []
for element in elements:
if element[0]==DBLM:
ret.append(element[1])
return ret
def get_bpms():
ret = []
@@ -193,22 +247,35 @@ def get_wire_scanners():
ret.append(element[1])
return ret
def get_wire_scanners_bpms(wire_scan):
last = None
ret = []
for element in elements:
if element[0]==DWSC and element[1] == wire_scan:
ret = [last,]
else:
if get_section_type(element[1]) == get_section_type(wire_scan):
elif element[0]==DBPM:
if get_beamline(element[1]) == get_beamline(wire_scan):
if len(ret) > 0:
return [ret[0],element[1]]
last = element[1]
return None
def get_wire_scanners_blms(wire_scan):
last = None
ret = []
for element in elements:
if element[0]==DWSC and element[1] == wire_scan:
ret = [last,]
elif element[0]==DBLM:
if get_beamline(element[1]) == get_beamline(wire_scan):
if len(ret) > 0:
if ret[0] is None: ret[0] = "S30CB02-DBLM445"
return [ret[0],element[1]]
last = element[1]
return None
#for w in get_wire_scanners():
# print w, get_wire_scanners_bpms(w)
script/Diagnostics/WireScan.py
+3 -3
View File
@@ -12,6 +12,7 @@ scan_range = args[2] if is_panel else [-2000, 2000, -2000, 2000]
cycles = args[3] if is_panel else 5
velocity = args[4] if is_panel else 200
bpms = args[5] if is_panel else get_wire_scanners_bpms(prefix)
blms = args[6] if is_panel else get_wire_scanners_blms(prefix)
print "WireScan parameters: ", prefix, scan_type, scan_range, cycles, cycles, bpms
#Creating WireScanner object
@@ -28,12 +29,11 @@ scanner.waitValue("At start", 60000)
channels = [("m_pos", scanner.motor_bs_readback.get_name()),
("cur_cycle", scanner.curr_cycl.get_name()),
("scanning", scanner.status_channels[0].get_name())]
#bpms = ["SINDI01-DBPM060", "SINDI02-DBPM010"] #For testing
for i in range (len(bpms)):
for sensor in BPM_SENSORS:
channels.append (("bpm" + str(i+1) + "_" + sensor[0], bpms[i] + ":" + sensor[1]))
for i in range (len(blms)):
channels.append ("blm" + str(i+1), blms[i] + ":B1_LOSS")
#Stream creation
print "Starting stream..."
script/test/TestMscan.py
+2 -1
View File
@@ -2,6 +2,7 @@ prefix = "S30CB09-DWSC440"
prefix = "SINDI01-DWSC090"
channels = [("m_pos", prefix+":ENC_1_BS"),
("blm", "SINLH02-DBLM235:B1_LOSS")
#("cur_cycle", prefix+":CURR_CYCL"),
# ("scanning", prefix+":SCANNING")
]
@@ -14,7 +15,7 @@ class w_pos(Readable):
st = Stream("pulse_id", dispatcher)
for c in channels:
st.addScalar(c[0], c[1], 10, 0)
st.addScalar(c[0], c[1], 100, 0)
st.initialize()
st.start()