diff --git a/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c b/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c
index 66843d3dc..8c5ddce01 100755
--- a/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c
@@ -4044,7 +4044,7 @@ void initializeDetector(){
     setFrames(-1);
     setTrains(-1);
     setExposureTime(-1);
-    setPeriod(-1);
+    setPeriod(1 * 1000 * 1000);//1ms
     setDelay(-1);
     setGates(-1);
     
diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
index cab8f9b7e..0a672768b 100644
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repsitory UUID: 2ed351b29db70212973e15b26f604a0a7fef6fcc 
-Revision: 14 
+Repsitory UUID: 9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7 
+Revision: 16 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1582 
-Last Changed Date: 2017-09-21 16:35:15.000000002 +0200 ./firmware_funcs.c
+Last Changed Rev: 1669 
+Last Changed Date: 2017-11-20 11:32:02.000000002 +0100 ./firmware_funcs.c
diff --git a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
index f9d5ebc89..e1929acee 100644
--- a/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
+++ b/slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "2ed351b29db70212973e15b26f604a0a7fef6fcc"
-//#define SVNREV 0x1582
+#define SVNREPUUID "9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7"
+//#define SVNREV 0x1669
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1582
-#define SVNDATE 0x20170921
+#define SVNREV 0x1669
+#define SVNDATE 0x20171120
 //
diff --git a/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer b/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
index 548f90505..53ce70ae6 100755
Binary files a/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer and b/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer differ
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 683661329..79e71ffdf 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -714,17 +714,24 @@ int slsDetector::initializeDetectorSize(detectorType type) {
     thisDetector->timerValue[CYCLES_NUMBER]=1;
     thisDetector->timerValue[SAMPLES_JCTB]=1;
 
+    // calculating databytes (special when with gap pixels, jctb, mythen in 24bit mode or using probes)
     thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*thisDetector->dynamicRange/8;
-    thisDetector->dataBytesInclGapPixels = getTotalNumberOfChannelsInclGapPixels(X)*getTotalNumberOfChannelsInclGapPixels(Y) * thisDetector->dynamicRange/8;
+	 thisDetector->dataBytesInclGapPixels =
+   			 (thisDetector->nMod[X] * thisDetector->nChips[X] * thisDetector->nChans[X] + thisDetector->gappixels * thisDetector->nGappixels[X]) *
+			 (thisDetector->nMod[Y] * thisDetector->nChips[Y] * thisDetector->nChans[Y] + thisDetector->gappixels * thisDetector->nGappixels[Y]) *
+			 thisDetector->dynamicRange/8;
 
-    if(thisDetector->myDetectorType==JUNGFRAUCTB) {
-      getTotalNumberOfChannels();
-      //      thisDetector->dataBytes=getTotalNumberOfChannels()*thisDetector->dynamicRange/8*thisDetector->timerValue[SAMPLES_JCTB];
+    if(thisDetector->myDetectorType==JUNGFRAUCTB){
+    	getTotalNumberOfChannels();	// recalculates nchans and databytes
+    	thisDetector->dataBytesInclGapPixels =  thisDetector->dataBytes;
     }
-    if(thisDetector->myDetectorType==MYTHEN){
+    else if(thisDetector->myDetectorType==MYTHEN){
     	if (thisDetector->dynamicRange==24 || thisDetector->timerValue[PROBES_NUMBER]>0) {
     		thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*4;
-    		thisDetector->dataBytesInclGapPixels = getTotalNumberOfChannelsInclGapPixels(X)*getTotalNumberOfChannelsInclGapPixels(Y) * thisDetector->nChans*4;
+    		 thisDetector->dataBytesInclGapPixels =
+    	   			 (thisDetector->nMod[X] * thisDetector->nChips[X] * thisDetector->nChans[X] + thisDetector->gappixels * thisDetector->nGappixels[X]) *
+    				 (thisDetector->nMod[Y] * thisDetector->nChips[Y] * thisDetector->nChans[Y] + thisDetector->gappixels * thisDetector->nGappixels[Y]) *
+    				 4;
     	}
     }
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h
index 1ef903b0b..035226c6a 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.h
+++ b/slsDetectorSoftware/slsDetector/slsDetector.h
@@ -114,7 +114,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
     int nModMax[2];
     /**  maximum number of modules (nModMax[X]*nModMax[Y]) \see nModMax */
     int nModsMax;
-    /**  number of channels per chip */
+    /**  number of channels per chip (used mainly in databytes calculation) */
     int nChans;
     /**  number of channels per chip in one direction */
     int nChan[2];
@@ -664,7 +664,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
   /** Returns the number of  modules in direction d (without connecting to the detector) */
   int getNMod(dimension d){return thisDetector->nMod[d];}; //
 
-  int getChansPerMod(int imod=0){return thisDetector->nChans*thisDetector->nChips;};
+  int getChansPerMod(int imod=0){return thisDetector->nChan[X]*thisDetector->nChan[Y]*thisDetector->nChips;};
 
   int getChansPerMod( dimension d,int imod=0){return thisDetector->nChan[d]*thisDetector->nChip[d];};