detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 18:40:42 +02:00
Code Issues Actions Packages Releases Activity

manual acq changed config file, added some changes for jungfrau that aren;t tested, but soleil acq test passed

Browse Source
This commit is contained in:
maliakal_d 2019-01-29 15:49:41 +01:00
parent fd68a41918
commit 12f8166d25
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
manual/manual-acq/gotthard25.config
View File

@ -1,28 +1,30 @@
detsizechan 2560 1 hostname bchip065+bchip195+
hostname ode-gotthard-m.ica.synchrotron-soleil.fr+ode-gotthard-s.ica.synchrotron-soleil.fr+
settingsdir /home/experiences/detecteurs/detecteurs/CCA/GotthardDetector-4.0.0/trunk/slsDetectorPackage/settingsdir/gotthard
angdir 1.000000
caldir /home/experiences/detecteurs/detecteurs/CCA/GotthardDetector-4.0.0/trunk/slsDetectorPackage/settingsdir/gotthard
0:rx_tcpport 1954 0:rx_tcpport 1954
0:rx_udpport 50001 0:rx_udpport 50005
0:rx_udpip 192.168.51.1 0:detectorip 10.1.1.4
0:detectorip 192.168.51.2 #0:detectorip 10.90.90.4
0:vhighvoltage 90 #0:detectorip 129.129.202.4
#0:rx_udpip 129.129.202.92
#0:rx_udpip 129.129.202.110
1:rx_tcpport 1955 1:rx_tcpport 1955
1:rx_udpport 50002 1:rx_udpport 50006
1:rx_udpip 192.168.52.1 1:detectorip 10.1.1.5
1:detectorip 192.168.52.2 #1:detectorip 10.90.90.53
#1:detectorip 129.129.202.5
#1:rx_udpip 129.129.202.92
#1:rx_udpip 129.129.202.110
0:extsig:0 trigger_in_rising_edge #rx_udpip 10.90.90.100
rx_udpip 10.1.1.100
rx_hostname dt-pctestbasler1.ica.synchrotron-soleil.fr rx_hostname pcmoench01
outdir /home/experiences/detecteurs/detecteurs/CCA/GotthardDetector-4.0.0/DeviceServers/files/ #rx_hostname mpc2012
angconv none outdir /home/l_msdetect/dhanya/outdir
threaded 1
vhighvoltage 0
enablefwrite 0
timing auto

9
manual/manual-acq/main.cpp
View File

@ -20,9 +20,9 @@
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "slsDetectorUsers.h" #include "slsDetectorUsers.h"
//#define GOTTHARD_25_TEST #define GOTTHARD_25_TEST
//#define JUNGFRAU_TEST //#define JUNGFRAU_TEST
#define GOTTHARD_TEST //#define GOTTHARD_TEST
//====================================================================================================== //======================================================================================================
// test configuration // test configuration
@ -526,8 +526,11 @@ int RunAcquisition(void)
// setting the gain mode // setting the gain mode
detector->setSettings(slsDetectorUsers::getDetectorSettings("dynamicgain")); detector->setSettings(slsDetectorUsers::getDetectorSettings("dynamicgain"));
#ifndef JUNGFRAU_TEST
detector->setSettings(slsDetectorUsers::getDetectorSettings("mediumgain")); detector->setSettings(slsDetectorUsers::getDetectorSettings("mediumgain"));
#else
detector->setSettings(slsDetectorUsers::getDetectorSettings("dynamichg0"));
#endif
// computing the number of frames // computing the number of frames
nb_frames = nb_cycles * nb_frames_per_cycle; nb_frames = nb_cycles * nb_frames_per_cycle;