diff --git a/manual/manual-acq/gotthard25.config b/manual/manual-acq/gotthard25.config index bd0948171..6a186f536 100644 --- a/manual/manual-acq/gotthard25.config +++ b/manual/manual-acq/gotthard25.config @@ -1,28 +1,30 @@ -detsizechan 2560 1 - -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 - +hostname bchip065+bchip195+ 0:rx_tcpport 1954 -0:rx_udpport 50001 -0:rx_udpip 192.168.51.1 -0:detectorip 192.168.51.2 -0:vhighvoltage 90 +0:rx_udpport 50005 +0:detectorip 10.1.1.4 +#0:detectorip 10.90.90.4 +#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_udpport 50002 -1:rx_udpip 192.168.52.1 -1:detectorip 192.168.52.2 +1:rx_udpport 50006 +1:detectorip 10.1.1.5 +#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 -outdir /home/experiences/detecteurs/detecteurs/CCA/GotthardDetector-4.0.0/DeviceServers/files/ -angconv none -threaded 1 +rx_hostname pcmoench01 +#rx_hostname mpc2012 +outdir /home/l_msdetect/dhanya/outdir +vhighvoltage 0 +enablefwrite 0 + +timing auto diff --git a/manual/manual-acq/main.cpp b/manual/manual-acq/main.cpp index 8c0182eb0..a8076f289 100644 --- a/manual/manual-acq/main.cpp +++ b/manual/manual-acq/main.cpp @@ -20,9 +20,9 @@ #include "sls_detector_defs.h" #include "slsDetectorUsers.h" -//#define GOTTHARD_25_TEST +#define GOTTHARD_25_TEST //#define JUNGFRAU_TEST -#define GOTTHARD_TEST +//#define GOTTHARD_TEST //====================================================================================================== // test configuration @@ -526,8 +526,11 @@ int RunAcquisition(void) // setting the gain mode detector->setSettings(slsDetectorUsers::getDetectorSettings("dynamicgain")); +#ifndef JUNGFRAU_TEST detector->setSettings(slsDetectorUsers::getDetectorSettings("mediumgain")); - +#else + detector->setSettings(slsDetectorUsers::getDetectorSettings("dynamichg0")); +#endif // computing the number of frames nb_frames = nb_cycles * nb_frames_per_cycle;