Eiger fixes

config/config.properties

@@ -1,4 +1,4 @@
-#Fri Dec 18 12:26:22 CET 2020
+#Fri Mar 05 11:56:08 CET 2021
 imageSourcesFile={config}/imaging.properties
 autoSaveScanData=true
 simulation=false
@@ -12,13 +12,16 @@ dataScanSaveScript=false
 dataScanSaveSetpoints=false
 notifiedTasks=EigerAbsSpec|Eiger2Img
 parallelInitialization=true
+dataTransferPath=~/Data1
 scanStreamingPort=-1
 saveConsoleSessionFiles=false
 devicePoolFile={config}/devices.properties
 versionTrackingManual=true
+dataTransferMode=Off
 hostName=null
 userManagement=true
 instanceName=SIM
+disableEmbeddedAttributes=false
 dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
@@ -32,11 +35,14 @@ logLevel=Info
 dataScanFlushRecords=true
 logPath={logs}/{date}_{time}
 dataLayout=table
+disableDataFileLogs=false
+sessionHandling=On
 deviceUpdateStrategyFile={config}/update.properties
 terminalEnabled=false
 notificationLevel=Completion
 terminalPort=3579
 tasksFile={config}/tasks.properties
+dataTransferUser=
 createSessionFiles=false
 versionTrackingLogin={context}/svcusr-hlapp_robot
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x11ma.git

config/filelisting.txt

@@ -0,0 +1,2 @@
+2021_02/20210202/20210202_5217_AbsortionSpectrum
+2021_02/20210202/20210202_Two_Pol

config/mail.properties

@@ -1,9 +1,9 @@
-#Fri Dec 18 12:27:08 CET 2020
+#Wed Feb 03 19:50:37 CET 2021
 auth=None
 port=0
 usr=
 smsSuffix=@sms.switch.ch
 host=smtpint.psi.ch
 from=pshell.sim@psi.ch
-to=alexgobbo@gmail.com
+to=
 pwd=

config/metadata.json

@@ -0,0 +1 @@
+{"sourceFolder":"/sls/X11MA/Data1/e18721","isPublished":true,"dataFormat":"txt","ownerGroup":"p18721","datasetName":"4_Test4","description":"Test4","endTime":"2021-02-02T16:02:22.089Z","type":"raw","scientificMetadata":{"Value":1},"creationLocation":"/PSI/SLS/SIM","principalInvestigator":"e18721"}

config/plugins.properties

@@ -7,5 +7,5 @@ EnergyScan.java=enabled
 DataAcquisition.java=enabled
 Eiger.java=enabled
 Beamline.java=enabled
-Settings.java=enabled
+Settings.java=disabled
 Test.java=disabled

config/scicat.properties

@@ -0,0 +1,11 @@
+#Wed Mar 03 11:24:27 CET 2021
+environment=prod
+testParameters=-testenv -user slssim\:4DMGBarXmr
+sourceFolder=/sls/X11MA/Data1/e18976
+prodParameters=\ -user slssim\:4DMGBarXmr
+devParameters=-devenv -user slssim\:slssim
+ownerGroup=
+type=raw
+parameters=-ingest -allowexistingsource -noninteractive -autoarchive
+creationLocation=/PSI/SLS/SIM
+principalInvestigator=guillaume.nataf@univ-tours.fr

config/session_metadata.properties

@@ -0,0 +1,5 @@
+#Tue Feb 23 14:45:34 CET 2021
+keywords=List;[]
+ownerEmail=String;muhammad.qadir@jh-inst.cas.cz
+contactEmail=String;armin.kleibert@psi.ch
+owner=String;Irfan Qadir

config/sessions.properties

@@ -0,0 +1,2 @@
+#Fri Feb 26 10:39:26 CET 2021
+SessionCounter=12

config/settings.properties

@@ -1,16 +1,16 @@
-#Wed Jan 27 14:57:59 CET 2021
+#Fri Mar 12 12:09:24 CET 2021
 HARMONIC_ID_1=1
-RSYNC_USER=e18904
+RSYNC_USER=
 OUTLIERS_THRESHOLD=1000000000
 NORM_FILE=/sls/X11MA/data/X11MA/Data1/2021/Yona250121/s250121
 AUTO_SWITCH_VALVE=true
 DRY_RUN=false
 POL_ID_2=Circ_Minus
-OFFSET_ID_1=-0.4
+OFFSET_ID_1=0.0
 ID=ID1_ID2
 OFFSET_ID_2=-1.1
 proposal=proposal
-ENERGY=778.0
+ENERGY=800.0
 proposer=proposer
 POL_ID_1=Circ_Plus
 RSYNC_HOST=

config/setup.properties

@@ -1,6 +1,9 @@
 #Mon Sep 30 16:07:34 CEST 2019
 scriptPath={home}/script
 sessionsPath={home}/sessions
+configFileSessions={config}/sessions.properties
+userSessionsPath={sessions}/user
+consoleSessionsPath={sessions}/console
 configFileImageSources={config}/imaging.properties
 pluginsPath={home}/plugins
 configFileDevices={config}/devices.properties

config/variables.properties

@@ -1,4 +1,4 @@
-#Wed Jan 27 16:03:59 CET 2021
-LastRunDate=210127
-FileSequentialNumber=5019
-DaySequentialNumber=67
+#Thu Mar 11 13:23:26 CET 2021
+LastRunDate=210311
+FileSequentialNumber=5936
+DaySequentialNumber=2

devices/image.properties

@@ -1,4 +1,4 @@
-#Fri Dec 18 09:55:11 CET 2020
+#Tue Feb 23 15:06:49 CET 2021
 spatialCalOffsetY=NaN
 spatialCalOffsetX=NaN
 colormapLogarithmic=false
@@ -6,7 +6,7 @@ scale=1.0
 grayscale=false
 spatialCalScaleX=NaN
 spatialCalScaleY=NaN
-colormapMax=2.0
+colormapMax=500.0
 rescaleOffset=0.0
 roiWidth=-1
 colormap=Grayscale

plugins/DataAcquisition.form

@@ -598,6 +598,7 @@
                                   <Component id="jLabel20" alignment="1" min="-2" max="-2" attributes="0"/>
                                   <Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
                                   <Component id="jLabel9" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="labelScans" alignment="1" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
@@ -619,6 +620,7 @@
                                           <Component id="spinnerImgEng2" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
                                       </Group>
                                   </Group>
+                                  <Component id="spinnerScans" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="32767" attributes="0"/>
                           </Group>
@@ -652,6 +654,11 @@
                                   <Component id="jLabel9" alignment="2" min="-2" max="-2" attributes="0"/>
                                   <Component id="spinnerImgAvg" linkSize="32" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="labelScans" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="spinnerScans" linkSize="32" alignment="2" min="-2" max="-2" attributes="0"/>
+                              </Group>
                               <EmptySpace type="unrelated" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="2" attributes="0">
                                   <Component id="checkImgAutosave" alignment="2" min="-2" max="-2" attributes="0"/>
@@ -803,6 +810,19 @@
                         <Property name="text" type="java.lang.String" value="Switch pol after scan"/>
                       </Properties>
                     </Component>
+                    <Component class="javax.swing.JLabel" name="labelScans">
+                      <Properties>
+                        <Property name="horizontalAlignment" type="int" value="11"/>
+                        <Property name="text" type="java.lang.String" value="Scans:"/>
+                      </Properties>
+                    </Component>
+                    <Component class="javax.swing.JSpinner" name="spinnerScans">
+                      <Properties>
+                        <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+                          <SpinnerModel initial="1" maximum="1000" minimum="1" numberType="java.lang.Integer" stepSize="1" type="number"/>
+                        </Property>
+                      </Properties>
+                    </Component>
                   </SubComponents>
                 </Container>
               </SubComponents>

plugins/DataAcquisition.java

@@ -187,6 +187,8 @@ public class DataAcquisition extends Panel {
         spinnerImgEng2.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
         spinnerImgEng1.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
         checkSwitchPol.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
+        spinnerScans.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
+        labelScans.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
         
         //panelSecondImage.setVisible(comboImgMethod.getSelectedItem() != ImgMethod.Take_Image.toString());
 
@@ -327,6 +329,7 @@ public class DataAcquisition extends Panel {
         args.put("ENERGY_1", spinnerImgEng1.getValue());
         args.put("ENERGY_2", spinnerImgEng2.getValue());
         args.put("SWITCH_POL", checkSwitchPol.isSelected());        
+        args.put("NUMBER_SCANS", (comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString()) ? ((Integer)spinnerScans.getValue()) : 1 );        
 
         runAsync("templates/Eiger2Img", args).handle((ret, t) -> {
             if ((t != null) && (!getContext().isAborted())) {
@@ -467,6 +470,8 @@ public class DataAcquisition extends Panel {
         labelSwitching1 = new javax.swing.JLabel();
         comboSeq = new javax.swing.JComboBox<>();
         checkSwitchPol = new javax.swing.JCheckBox();
+        labelScans = new javax.swing.JLabel();
+        spinnerScans = new javax.swing.JSpinner();
         jPanel9 = new javax.swing.JPanel();
         dvpEnergya3 = new ch.psi.pshell.swing.DeviceValuePanel();
         dvpOffID1b = new ch.psi.pshell.swing.DeviceValuePanel();
@@ -901,6 +906,11 @@ public class DataAcquisition extends Panel {
 
         checkSwitchPol.setText("Switch pol after scan");
 
+        labelScans.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+        labelScans.setText("Scans:");
+
+        spinnerScans.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
+
         javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
         jPanel5.setLayout(jPanel5Layout);
         jPanel5Layout.setHorizontalGroup(
@@ -921,7 +931,8 @@ public class DataAcquisition extends Panel {
                 .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(jLabel20, javax.swing.GroupLayout.Alignment.TRAILING)
                     .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING))
+                    .addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelScans, javax.swing.GroupLayout.Alignment.TRAILING))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -937,11 +948,12 @@ public class DataAcquisition extends Panel {
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                            .addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                    .addComponent(spinnerScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp, spinnerImgMeasurements});
+        jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp, spinnerImgMeasurements, spinnerScans});
 
         jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {checkImgAutosave, comboImgMethod, comboSeq, comboSwitch});
 
@@ -970,6 +982,10 @@ public class DataAcquisition extends Panel {
                     .addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabel9)
                     .addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(labelScans)
+                    .addComponent(spinnerScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(checkImgAutosave)
@@ -979,7 +995,7 @@ public class DataAcquisition extends Panel {
 
         jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {comboImgMethod, comboSeq, comboSwitch});
 
-        jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgExp, spinnerImgMeasurements});
+        jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgExp, spinnerImgMeasurements, spinnerScans});
 
         javax.swing.GroupLayout panelImgControlsLayout = new javax.swing.GroupLayout(panelImgControls);
         panelImgControls.setLayout(panelImgControlsLayout);
@@ -1829,6 +1845,7 @@ public class DataAcquisition extends Panel {
     private javax.swing.JLabel labelOffID2a1;
     private javax.swing.JLabel labelOffID2a2;
     private javax.swing.JLabel labelOffID2b;
+    private javax.swing.JLabel labelScans;
     private javax.swing.JLabel labelSwitching;
     private javax.swing.JLabel labelSwitching1;
     private javax.swing.JPanel panelImgControls;
@@ -1846,6 +1863,7 @@ public class DataAcquisition extends Panel {
     private javax.swing.JSpinner spinnerImgExp;
     private javax.swing.JSpinner spinnerImgMeasurements;
     private javax.swing.JSpinner spinnerOutliersThreshold;
+    private javax.swing.JSpinner spinnerScans;
     private javax.swing.JSpinner spinnerSpecAvg;
     private javax.swing.JSpinner spinnerSpecExp;
     private javax.swing.JSpinner spinnerSpecScans;

plugins/Eiger.form

@@ -128,7 +128,7 @@
     </Component>
     <Component class="javax.swing.JButton" name="buttonTriggerDetector">
       <Properties>
-        <Property name="text" type="java.lang.String" value="Start"/>
+        <Property name="text" type="java.lang.String" value="Start IOC"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonTriggerDetectorActionPerformed"/>
@@ -190,7 +190,7 @@
     </Component>
     <Component class="javax.swing.JButton" name="buttonStopDetector">
       <Properties>
-        <Property name="text" type="java.lang.String" value="Stop"/>
+        <Property name="text" type="java.lang.String" value="Stop IOC"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonStopDetectorActionPerformed"/>

plugins/Eiger.java

@@ -115,7 +115,7 @@ public class Eiger extends Panel {
             }
         });
 
-        buttonTriggerDetector.setText("Start");
+        buttonTriggerDetector.setText("Start IOC");
         buttonTriggerDetector.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 buttonTriggerDetectorActionPerformed(evt);
@@ -148,7 +148,7 @@ public class Eiger extends Panel {
 
         deviceValuePanel3.setDeviceName("eiger_exposure_rbv");
 
-        buttonStopDetector.setText("Stop");
+        buttonStopDetector.setText("Stop IOC");
         buttonStopDetector.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 buttonStopDetectorActionPerformed(evt);
@@ -260,7 +260,7 @@ public class Eiger extends Panel {
 
     private void buttonTriggerDetectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonTriggerDetectorActionPerformed
         try {
-            evalAsync("eiger.start()").handle((ret,ex)->{
+            evalAsync("start_eiger_ioc()").handle((ret,ex)->{
                 if (ex!=null){
                     showException((Exception)ex);
                 }
@@ -294,7 +294,7 @@ public class Eiger extends Panel {
 
     private void buttonStopDetectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStopDetectorActionPerformed
         try {
-            evalAsync("eiger.start()").handle((ret,ex)->{
+            evalAsync("stop_eiger_ioc()").handle((ret,ex)->{
                 if (ex!=null){
                     showException((Exception)ex);
                 }