From 2cd2dbadc05241a54a47d9995cf10358dcf8a77c Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 21 May 2015 11:18:04 +0200 Subject: [PATCH] included scripts for diff and status --- .gitignore | 1 + Makefile.include | 2 +- diffall.sh | 11 +++++++++++ settingsdir/eiger/standard/noise.snbeb031 | Bin 0 -> 1048640 bytes settingsdir/eiger/standard/noise.snbeb032 | Bin 0 -> 1048640 bytes statusall.sh | 11 +++++++++++ 6 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 diffall.sh create mode 100644 settingsdir/eiger/standard/noise.snbeb031 create mode 100644 settingsdir/eiger/standard/noise.snbeb032 create mode 100644 statusall.sh diff --git a/.gitignore b/.gitignore index 2ff4220ee..b75f7dfad 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ slsDetectorGui/ slsDetectorSoftware/ slsReceiverSoftware/ slsDetectorCalibration/ +slsImageReconstruction/ diff --git a/Makefile.include b/Makefile.include index 5b3a8afb1..56417f682 100644 --- 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_DEBUG #-DFIFO_DEBUG +FLAGS= -Wall #-DEIGER_DEBUG -DEIGER_DEBUG2 #-DWRITE_HEADERS #-DEIGER_DEBUG #-DFIFO_DEBUG # -DVERBOSE # Setting up the verbose flags diff --git a/diffall.sh b/diffall.sh new file mode 100644 index 000000000..ce51b3424 --- /dev/null +++ b/diffall.sh @@ -0,0 +1,11 @@ +git diff; +cd slsDetectorSoftware; +git diff; +cd ../slsReceiverSoftware; +git diff; +cd ../slsDetectorGui; +git diff; +cd ../slsDetectorCalibration; +git diff; +cd ../slsImageReconstruction; +git diff; diff --git a/settingsdir/eiger/standard/noise.snbeb031 b/settingsdir/eiger/standard/noise.snbeb031 new file mode 100644 index 0000000000000000000000000000000000000000..13be1781a674d6ee19555ae46055abee5c1a4783 GIT binary patch literal 1048640 zcmeIwu?;|A5C!0u2qF