From c73d9f41034eb364d9c83aa8b8d39145eadee237 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 13 Nov 2015 17:44:24 +0100 Subject: [PATCH] merged and gotthard 2 det example --- Makefile.include | 2 +- examples/two_gotthard.config | 2 ++ settingsdir/eiger/standard/noise.sn031 | Bin 0 -> 1048640 bytes settingsdir/eiger/standard/noise.sn032 | Bin 0 -> 1048640 bytes settingsdir/eiger/standard/noise.snbeb031 | Bin 1048640 -> 0 bytes settingsdir/eiger/standard/noise.snbeb032 | Bin 1048640 -> 0 bytes 6 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 settingsdir/eiger/standard/noise.sn031 create mode 100644 settingsdir/eiger/standard/noise.sn032 delete mode 100644 settingsdir/eiger/standard/noise.snbeb031 delete mode 100644 settingsdir/eiger/standard/noise.snbeb032 diff --git a/Makefile.include b/Makefile.include index 0b286c865..b12d1e6c4 100755 --- a/Makefile.include +++ b/Makefile.include @@ -7,7 +7,7 @@ CXX = $(CC) ASM=$(shell echo "/lib/modules/`uname -r`/build/include") LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread -FLAGS= -Wall #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG +FLAGS= -Wall #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG # -DVERBOSE # Setting up the verbose flags diff --git a/examples/two_gotthard.config b/examples/two_gotthard.config index 25306a97b..cebea3d54 100644 --- a/examples/two_gotthard.config +++ b/examples/two_gotthard.config @@ -1,5 +1,7 @@ #####Any line with a # is not read###### +detsizechan 2560 1 + #type Gotthard+ hostname bchip007+bchip009+ diff --git a/settingsdir/eiger/standard/noise.sn031 b/settingsdir/eiger/standard/noise.sn031 new file mode 100644 index 0000000000000000000000000000000000000000..419fc0139755e6f12f7d40015d7fbeeaec9d623a GIT binary patch literal 1048640 zcmeIuu?c`c5Cp&lQ4vJjwH!;Z3`2`Bum}TR