This commit is contained in:
2023-05-01 11:28:04 +02:00
parent 3a83f3cf34
commit abe3bcb19c
265 changed files with 28663 additions and 1295 deletions

BIN
config/.DS_Store vendored

Binary file not shown.

View File

@@ -1,48 +1,72 @@
#Tue Mar 30 11:55:18 CEST 2021
#Mon May 01 11:27:46 CEST 2023
XScanAppendSuffix=true
XScanCrlogicAbortable=true
XScanCrlogicChannel=null
XScanCrlogicIoc=null
XScanCrlogicPrefix=null
XScanCrlogicSimulated=false
XScanMoveTimeout=600
autoSaveScanData=true
simulation=false
commandExecutionEvents=true
logDaysToLive=50
createSessionFiles=false
dataLayout=default
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
dataProvider=h5
dataScanFlushRecords=true
dataScanLazy=false
dataScanLazyTableCreation=false
dataScanPreserveTypes=false
dataScanReleaseRecords=false
dataScanSaveOutput=false
handleSessions=true
userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
logLevelConsole=Off
scanStreamerPort=5563
dataScanSaveScript=false
dataScanSaveSetpoints=false
dataScanSaveSetpoints=true
dataServerPort=5573
dataTransferHost=
dataTransferMode=Off
dataTransferPath=~/test/transfer
dataTransferUser=gobbo_a
depthDimension=0
disableDataFileLogs=false
disableEmbeddedAttributes=true
fdaSerialization=true
filePermissionsConfig=Default
filePermissionsData=Default
filePermissionsLogs=Protected
filePermissionsScripts=Default
generateCommandExecutionEvents=true
handleSessions=true
hideServerMessages=false
hostName=
instanceName=Dev
logDaysToLive=50
logLevel=Fine
logLevelConsole=Off
logPath={logs}/{date}_{time}
noBytecodeFiles=false
notificationLevel=User
notifiedTasks=Test1,TestDate, xxx
parallelInitialization=false
dataTransferPath=~/test/transfer
saveConsoleSessionFiles=false
dataTransferHost=
versionTrackingManual=true
dataTransferMode=Off
hostName=
userManagement=true
instanceName=Dev
disableEmbeddedAttributes=true
dataServerPort=5573
hideServerMessages=false
serverPort=8080
versionTrackingEnabled=true
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
serverEnabled=false
dataScanReleaseRecords=false
depthDimension=0
dataScanPreserveTypes=false
logLevel=Fine
dataScanFlushRecords=false
logPath={logs}/{date}_{time}
dataLayout=default
disableDataFileLogs=false
sessionHandling=On
generateCommandExecutionEvents=true
terminalEnabled=false
notificationLevel=Off
terminalPort=0
dataTransferUser=gobbo_a
createSessionFiles=false
versionTrackingLogin={context}/svcusr-hlapp_robot
versionTrackingRemote=git@git.psi.ch\:pshell_config/dev.git
dataProvider=h5
saveCommandStatistics=true
saveConsoleSessionFiles=false
scanStreamerPort=5563
serverEnabled=false
serverPort=8080
sessionHandling=On
simulation=false
terminalEnabled=false
terminalPort=0
userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
userManagement=true
versionTrackingEnabled=true
versionTrackingLogin={context}/svcusr-hlapp_robot
versionTrackingManual=true
versionTrackingRemote=git@git.psi.ch\:pshell_config/dev.git
xScanUsesFDASerialization=true
xscanAppendSuffix=true
xscanContinuousUpdate=false
xscanCrlogicAbortable=true
xscanCrlogicChannel=null
xscanCrlogicIoc=null
xscanCrlogicPrefix=null
xscanCrlogicSimulated=false
xscanMoveTimeout=600

View File

@@ -1,14 +1,18 @@
$det=ch.psi.pshell.epics.AreaDetector|13SIM1||1000|true
$bc=ch.psi.pshell.epics.AreaDetector|X09DA-FE-BEAMSZX|||true
bi=ch.psi.pshell.imaging.CameraSource|bc||-1000|
sp=ch.psi.pshell.serial.SerialPortDevice||||
$pol_offset=ch.psi.pshell.epics.ChannelDouble|TEST|||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
image=ch.psi.pshell.imaging.CameraSource|det|||true
#image2=ch.psi.pshell.imaging.CameraSource|det2|||
dispatcher=ch.psi.pshell.bs.Provider|tcp://localhost:9999|||
bs=ch.psi.pshell.bs.Provider|tcp://SFTEST-CVME-DBPM1:9000|||
#cam_server_local=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true
cam_server=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true
#ts1=ch.psi.pshell.epics.GenericArray|TESTIOC:TESTWF2:MyWF|||
cs=ch.psi.pshell.bs.CameraServer|localhost:8888|||true
pip=ch.psi.pshell.camserver.PipelineStream|localhost:8889 simulation_sp|||true
#ts1=ch.psi.pshell.epics.GenericArray|TESTIOC:TESTWF2:MyWF|||false
#monit_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=2 reopen||-200|false
#tststr=ch.psi.pshell.epics.ChannelString|TESTIOC:TESTSINUS:SinCalc|||
#stream=ch.psi.pshell.bs.Stream|<dispatcher> #false:boolean|||
@@ -56,7 +60,7 @@ dp=ch.psi.pshell.epics.DiscretePositioner|TESTIOC:CMD|||true
#dev=ch.psi.pshell.device.DummyRegister|6|||
#dev2=ch.psi.pshell.device.MyDevice||||
#$vhq=ch.psi.pshell.epics.ChannelDouble|T-MMDV5:IST:2 6|Read||
#outc=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTCALCOUT:Output|||true
outi=ch.psi.pshell.epics.ChannelInteger|TESTIOC:TESTCALCOUT:Output|||true
#inpc=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTCALCOUT:Input|||true
out=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTCALCOUT:Output 6|||true
#outx=ch.psi.pshell.epics.ProcessVariable|TESTIOC:TESTCALCOUT:Output|||true
@@ -72,7 +76,7 @@ arr1=ch.psi.pshell.epics.ChannelIntegerArray|TESTIOC:TESTWF2:MyWF -1 false|||
mt=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 2 3 false|||
mt1=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 3 2 False None [i|||
as1=ch.psi.pshell.imaging.RegisterArraySource|arr1|||
cm1=ch.psi.pshell.epics.ChannelIntegerMatrix|TESTIOC:TESTWF2:MyWF 3 3 false|||
cm1=ch.psi.pshell.epics.ChannelIntegerMatrix|TESTIOC:TESTWF2:MyWF 3 2 false|||
pv=ch.psi.pshell.epics.ProcessVariable|TESTIOC:TESTCALCOUT:Input|||true
shutter=ch.psi.pshell.epics.BinaryPositioner|TESTIOC:TESTBO:MyBO TESTIOC:TESTBO:MyBO|||true
$motor=ch.psi.pshell.epics.Motor|MTEST-GOBBO:MOT1|||true
@@ -93,7 +97,7 @@ cv=ch.psi.pshell.epics.ControlledVariable|TESTIOC:TESTCALCOUT:Input TESTIOC:TEST
#tcp=ch.psi.pshell.serial.TcpDevice|127.0.0.1:5554|||
#beeper=Beeper||||
#imgbis=ch.psi.pshell.imaging.CameraSource|det||-500|
#sc=ch.psi.pshell.imaging.CameraSource|scienta||-500|
sc=ch.psi.pshell.imaging.CameraSource|scienta||-500|
tst=ch.psi.pshell.imaging.FileSource|/Users/gobbo_a/Pictures/rsz_spine_pin.png|||
ca=ch.psi.pshell.imaging.ColormapAdapter|tst||-500|
#tst2=ch.psi.pshell.imaging.FileSource|C:\\Users\\gobbo_a\\Pictures\\tst.png||-500|
@@ -101,8 +105,8 @@ ca=ch.psi.pshell.imaging.ColormapAdapter|tst||-500|
#rec=ch.psi.pshell.detector.Receiver|tcp://127.0.0.1:5444|||true
#rec2=ch.psi.pshell.detector.Receiver|tcp://127.0.0.1:5555||-500|false
#pvt=ch.psi.pshell.epics.ProcessVariable|TESTIOC:TESTCALCOUT:Input|Read||
#$master=ch.psi.pshell.modbus.ModbusTCP|127.0.0.1|||
#ai=ch.psi.pshell.modbus.AnalogOutput|master 0|||
#$tcp_master=ch.psi.pshell.modbus.ModbusTCP|127.0.0.1|||
#ai=ch.psi.pshell.modbus.AnalogOutput|tcp_master 0|||
#cache=ch.psi.pshell.device.RegisterCache|sin|||
#$scaler=ch.psi.pshell.epics.Scaler|SCALER|||
#testpos=ch.psi.pshell.device.DummyPositioner||||true
@@ -129,6 +133,7 @@ phi=ch.psi.pshell.device.DummyMotor||||true
#fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi|||
fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
energy=ch.psi.pshell.device.DummyPositioner||||true
gch=ch.psi.pshell.epics.GenericChannel|TESTIOC:TESTSINUS:SinCalc|||
gch=ch.psi.pshell.epics.GenericChannel|TESTIOC:TESTSINUS:SinCalc false|||
garr=ch.psi.pshell.epics.GenericArray|TESTIOC:TESTWF2:MyWF -1 False|||
darr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF|||
master=ch.psi.pshell.device.MasterPositioner|mu delta gamma eta|||

BIN
config/diffcalc/.DS_Store vendored Normal file

Binary file not shown.

18
config/jcae.properties Executable file → Normal file
View File

@@ -1,12 +1,12 @@
#Mon Mar 08 09:04:03 CET 2021
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
ch.psi.jcae.impl.DefaultChannelService.timeout=500
ch.psi.jcae.ChannelFactory.timeout=500
ch.psi.jcae.ContextFactory.maxSendArrayBytes=1000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ContextFactory.useShellVariables=false
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
ch.psi.jcae.ContextFactory.addressList=127.0.0.1 127.0.0.1\:54321
#Wed Aug 17 16:47:59 CEST 2022
ch.psi.jcae.ContextFactory.addressList=localhost\:54321 sls-cagw.psi.ch\:5062
ch.psi.jcae.ContextFactory.serverPort=
ch.psi.jcae.ContextFactory.maxArrayBytes=20000000
ch.psi.jcae.ContextFactory.maxSendArrayBytes=20000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ChannelFactory.timeout=3000
ch.psi.jcae.impl.DefaultChannelService.retries=1
ch.psi.jcae.impl.DefaultChannelService.timeout=1000
ch.psi.jcae.ContextFactory.autoAddressList=true
ch.psi.jcae.ContextFactory.useShellVariables=false
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=true

View File

@@ -0,0 +1,12 @@
#Mon Mar 08 09:04:03 CET 2021
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
ch.psi.jcae.impl.DefaultChannelService.timeout=500
ch.psi.jcae.ChannelFactory.timeout=500
ch.psi.jcae.ContextFactory.maxSendArrayBytes=1000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ContextFactory.useShellVariables=false
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
ch.psi.jcae.ContextFactory.addressList=127.0.0.1 127.0.0.1\:54321
ch.psi.jcae.ContextFactory.serverPort=
ch.psi.jcae.impl.DefaultChannelService.retries=1
ch.psi.jcae.ContextFactory.autoAddressList=true

View File

@@ -1,3 +1,21 @@
sc.java=disabled
Regine.java=disabled
ScreenPanel11.java=disabled
ScreenPanel1.java=disabled
ScreenPanel10.java=disabled
MXSC-1.15.0.jar=disabled
Standard.java=disabled
TstProc.java=disabled
SIStem.java=disabled
ShiftsIO.java=disabled
Align_ComputeShifts2.java=disabled
Align_TranslationFilter2.java=disabled
Align_ComplexEdgeFiltering.java=disabled
Align_TranslationFilter.java=disabled
Align_ComputeShifts.java=disabled
ScreenPanel8.java=disabled
ScreenPanel9.java=disabled
ScreenPanel7.java=disabled
HarmonicScan.java=disabled
Sven.java=disabled
ScreenPanel6.java=disabled
@@ -11,7 +29,7 @@ ScreenPanel3OLD.java=disabled
ScreenPanel3New.java=disabled
a.java=disabled
maxsize.java=disabled
MiniPID.java=enabled
MiniPID.java=disabled
SpinnerLayoutTest.java=disabled
MXSC-1.10.0.jar=disabled
ScreenPanel3.java=disabled
@@ -30,7 +48,7 @@ LayoutParallelScan.py=disabled
PhaseScan.java=disabled
PythonInteractive.java=disabled
RotationReadback.java=disabled
SfCamera.java=enabled
SfCamera.java=disabled
ScreenPanel.java=disabled
Didier.java=disabled
PersonalizedTheme.java=disabled

BIN
config/preferences.bin Normal file

Binary file not shown.

137
config/preferences.json Normal file
View File

@@ -0,0 +1,137 @@
{
"fontShellPanel" : {
"name" : "Monospaced",
"style" : 0,
"size" : 12
},
"fontShellCommand" : {
"name" : "SansSerif",
"style" : 0,
"size" : 13
},
"fontOutput" : {
"name" : "Monospaced",
"style" : 0,
"size" : 12
},
"fontEditor" : {
"name" : "Monospaced",
"style" : 0,
"size" : 12
},
"fontPlotLabel" : {
"name" : "SansSerif",
"style" : 0,
"size" : 11
},
"fontPlotTick" : {
"name" : "SansSerif",
"style" : 0,
"size" : 10
},
"fontPlotTitle" : {
"name" : "SansSerif",
"style" : 1,
"size" : 13
},
"fontTerminal" : {
"name" : "Menlo",
"style" : 0,
"size" : 14
},
"tabSize" : 4,
"contentWidth" : 0,
"editorBackground" : null,
"editorForeground" : null,
"simpleEditor" : false,
"hideEditorLineNumbers" : false,
"hideEditorContextMenu" : false,
"consoleLocation" : "Left",
"dataPanelLocation" : "Status",
"openDataFilesInDocTab" : false,
"noVariableEvaluationPropagation" : false,
"processingScripts" : [ ],
"asyncViewersUpdate" : false,
"asyncHistoryPlotsUpdate" : true,
"scanPlotDisabled" : false,
"scanTableDisabled" : false,
"cachedDataPanel" : false,
"dataExtensions" : "log txt xml py png tif tiff mat",
"dataSubFiles" : "*",
"hideFileName" : false,
"showEmergencyStop" : false,
"showHomingButtons" : false,
"showJogButtons" : false,
"hideScanPanel" : false,
"hideOutputPanel" : false,
"showXScanFileBrowser" : true,
"showQueueBrowser" : true,
"backgroundRendering" : false,
"showImageStatusBar" : true,
"persistRendererWindows" : false,
"defaultRendererColormap" : "Grayscale",
"linePlot" : "ch.psi.pshell.plot.LinePlotJFree",
"matrixPlot" : "ch.psi.pshell.plot.MatrixPlotJFree",
"surfacePlot" : "null",
"timePlot" : "ch.psi.pshell.plot.TimePlotJFree",
"plotsDetached" : false,
"plotsHidden" : false,
"plotLayout" : "Vertical",
"quality" : "High",
"defaultPlotColormap" : "Temperature",
"markerSize" : 2,
"plotBackground" : null,
"gridColor" : null,
"outlineColor" : null,
"disableOffscreenBuffer" : false,
"defaultPanels" : [ {
"deviceClassName" : "ch.psi.pshell.epics.Scaler",
"panelClassName" : "ch.psi.pshell.swing.ScalerPanel"
}, {
"deviceClassName" : "ch.psi.pshell.epics.Scienta",
"panelClassName" : "ch.psi.pshell.swing.ScientaPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.Motor",
"panelClassName" : "ch.psi.pshell.swing.MotorPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.MasterPositioner",
"panelClassName" : "ch.psi.pshell.swing.MasterPositionerPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.ProcessVariable",
"panelClassName" : "ch.psi.pshell.swing.ProcessVariablePanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.MotorGroup",
"panelClassName" : "ch.psi.pshell.swing.MotorGroupPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.DiscretePositioner",
"panelClassName" : "ch.psi.pshell.swing.DiscretePositionerPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.Camera",
"panelClassName" : "ch.psi.pshell.swing.CameraPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.Slit",
"panelClassName" : "ch.psi.pshell.swing.SlitPanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.HistogramGenerator",
"panelClassName" : "ch.psi.pshell.swing.HistogramGeneratorPanel"
}, {
"deviceClassName" : "ch.psi.pshell.bs.Stream",
"panelClassName" : "ch.psi.pshell.swing.StreamPanel"
}, {
"deviceClassName" : "ch.psi.pshell.bs.StreamChannel",
"panelClassName" : "ch.psi.pshell.swing.StreamChannelPanel"
}, {
"deviceClassName" : "ch.psi.pshell.camserver.CamServerStream",
"panelClassName" : "ch.psi.pshell.swing.CamServerStreamPanel"
}, {
"deviceClassName" : "ch.psi.pshell.camserver.CamServerService",
"panelClassName" : "ch.psi.pshell.swing.CamServerServicePanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterArray",
"panelClassName" : "ch.psi.pshell.swing.DeviceValueChart"
}, {
"deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterMatrix",
"panelClassName" : "ch.psi.pshell.swing.DeviceValueChart"
} ],
"scriptPopupDialog" : "Exception"
}

View File

@@ -1,4 +1,4 @@
#Wed Feb 03 15:17:53 CET 2021
#Thu May 06 14:19:02 CEST 2021
environment=test
testParameters=-testenv -user slssim\:4DMGBarXmr
sourceFolder=/Users/gobbo_a/dev/pshell/config/home/data
@@ -8,4 +8,4 @@ ownerGroup=p00001
type=raw
parameters=-ingest -allowexistingsource -noninteractive
creationLocation=/PSI/SLS/SIM
principalInvestigator=
principalInvestigator=asd

View File

@@ -1,3 +1,3 @@
#Mon Mar 08 08:50:39 CET 2021
SessionCounter=161
CurrentSession=161
#Mon Apr 03 15:43:39 CEST 2023
CurrentSession=177
SessionCounter=177

View File

@@ -1,6 +1,7 @@
#Wed Apr 28 09:28:40 CEST 2021
test=1
geometry=fourcv
ScanIndex=5
RSYNC_PATH=~/test/transfer
#Fri Aug 12 13:48:45 CEST 2022
FdaBrowser=true
OUTLIERS_THRESHOLD=200
RSYNC_PATH=~/test/transfer
ScanIndex=5
geometry=fourcv
test=1

View File

@@ -1,7 +1,9 @@
#Thu Feb 11 17:17:34 CET 2021
#Fri Jun 10 11:48:34 CEST 2022
scriptPath={home}/script
sessionsPath={outp}/sessions
configFileDevices={config}/devices.properties
xscanPath={script}/test
queuePath={script}/queues
extensionsPath={home}/extensions
configFileUpdateStrategy={config}/update.properties
configPath={home}/config
@@ -16,7 +18,7 @@ configFileTasks={config}/tasks.properties
configFileImageSources={config}/imaging.properties
pluginsPath={home}/plugins
consoleSessionsPath={sessions}/console
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial; {script}/imaging
configFilePlugins={config}/plugins.properties
contextPath={outp}/context
devicesPath={home}/devices

View File

@@ -1,5 +1,5 @@
#outupdate=0.0
#spectrum=1.0
#back=-1.0
#task1=2.0
#task2=1.0
#outupdate=-1.0;3.0
#spectrum=1.0;1.0
#back=-1.0;1.0
#task1=10.0;0.0
#task2=1.0;1.0

View File

@@ -1,6 +1,7 @@
#Mon Apr 12 12:26:10 CEST 2021
LastRunDate=210412
SessionCounter=127
#Tue Apr 18 14:30:53 CEST 2023
CurrentSession=122
FileSequentialNumber=1859
DaySequentialNumber=1
FileSequentialNumber=5709
LastRunDate=230418
SessionCounter=127
xxx=[1, 2, 3, 4]

11
config/xscan.properties Normal file
View File

@@ -0,0 +1,11 @@
#Tue Mar 14 09:40:01 CET 2023
actorMoveTimeout=600
appendSuffix=true
channelCreationRetries=1
crlogicAbortable=false
crlogicChannel=
crlogicIoc=
crlogicPrefix=
crlogicSimulated=false
dataBaseDirectory={data}
dataFilePrefix=