diff --git a/serverBin/ctbDetectorServer_developer b/serverBin/ctbDetectorServer_developer deleted file mode 120000 index 2304a2043..000000000 --- a/serverBin/ctbDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer \ No newline at end of file diff --git a/serverBin/ctbDetectorServerv9.1.0 b/serverBin/ctbDetectorServerv9.1.0 new file mode 120000 index 000000000..a13eac137 --- /dev/null +++ b/serverBin/ctbDetectorServerv9.1.0 @@ -0,0 +1 @@ +../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv9.1.0 \ No newline at end of file diff --git a/serverBin/eigerDetectorServer_developer b/serverBin/eigerDetectorServer_developer deleted file mode 120000 index 117c94c37..000000000 --- a/serverBin/eigerDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv9.0.0 b/serverBin/eigerDetectorServerv9.0.0 new file mode 120000 index 000000000..4304e388f --- /dev/null +++ b/serverBin/eigerDetectorServerv9.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv9.0.0 \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServer_developer b/serverBin/gotthard2DetectorServer_developer deleted file mode 120000 index 7c8e54bee..000000000 --- a/serverBin/gotthard2DetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServerv9.0.0 b/serverBin/gotthard2DetectorServerv9.0.0 new file mode 120000 index 000000000..9ed8c6365 --- /dev/null +++ b/serverBin/gotthard2DetectorServerv9.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv9.0.0 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServer_developer b/serverBin/gotthardDetectorServer_developer deleted file mode 120000 index 28e8385e0..000000000 --- a/serverBin/gotthardDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv9.0.0 b/serverBin/gotthardDetectorServerv9.0.0 new file mode 120000 index 000000000..e2758e2b8 --- /dev/null +++ b/serverBin/gotthardDetectorServerv9.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv9.0.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServer_developer b/serverBin/jungfrauDetectorServer_developer deleted file mode 120000 index 8ae22b591..000000000 --- a/serverBin/jungfrauDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv9.1.0 b/serverBin/jungfrauDetectorServerv9.1.0 new file mode 120000 index 000000000..0d51aa851 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv9.1.0 @@ -0,0 +1 @@ +../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv9.1.0 \ No newline at end of file diff --git a/serverBin/moenchDetectorServer_developer b/serverBin/moenchDetectorServer_developer deleted file mode 120000 index 147ecfb53..000000000 --- a/serverBin/moenchDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv9.0.0 b/serverBin/moenchDetectorServerv9.0.0 new file mode 120000 index 000000000..aafcf2249 --- /dev/null +++ b/serverBin/moenchDetectorServerv9.0.0 @@ -0,0 +1 @@ +../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv9.0.0 \ No newline at end of file diff --git a/serverBin/mythen3DetectorServer_developer b/serverBin/mythen3DetectorServer_developer deleted file mode 120000 index cc8b2c91f..000000000 --- a/serverBin/mythen3DetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer \ No newline at end of file diff --git a/serverBin/mythen3DetectorServerv9.1.0 b/serverBin/mythen3DetectorServerv9.1.0 new file mode 120000 index 000000000..f8c18a0e4 --- /dev/null +++ b/serverBin/mythen3DetectorServerv9.1.0 @@ -0,0 +1 @@ +../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv9.1.0 \ No newline at end of file diff --git a/serverBin/xilinx_ctbDetectorServerv9.1.0 b/serverBin/xilinx_ctbDetectorServerv9.1.0 new file mode 120000 index 000000000..416fbcee7 --- /dev/null +++ b/serverBin/xilinx_ctbDetectorServerv9.1.0 @@ -0,0 +1 @@ +../slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServerv9.1.0 \ No newline at end of file diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv9.1.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv9.1.0 new file mode 100755 index 000000000..3a6717777 Binary files /dev/null and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv9.1.0 differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index d9287e862..b0d8c1ea5 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -50,7 +50,7 @@ #define DEFAULT_NUM_CYCLES (1) #define DEFAULT_GATE_WIDTH (100 * 1000 * 1000) // ns #define DEFAULT_GATE_DELAY (0) -#define DEFAULT_PERIOD (2 * 1000 * 1000) // ns +#define DEFAULT_PERIOD (0) // ns #define DEFAULT_DELAY_AFTER_TRIGGER (0) #define DEFAULT_HIGH_VOLTAGE (0) #define DEFAULT_TIMING_MODE (AUTO_TIMING) diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 7ef5581fb..cbf7b6e7a 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -3,7 +3,6 @@ /** API versions */ #define APIGOTTHARD "9.0.0 0x241121" #define APIGOTTHARD2 "9.0.0 0x241121" -#define APIMYTHEN3 "9.0.0 0x241121" #define APIMOENCH "9.0.0 0x241121" #define APIEIGER "9.0.0 0x241121" #define APILIB "9.1.0 0x250204" @@ -11,3 +10,4 @@ #define APICTB "9.1.0 0x250204" #define APIXILINXCTB "9.1.0 0x250204" #define APIJUNGFRAU "9.1.0 0x250224" +#define APIMYTHEN3 "9.1.0 0x250304"