diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 8aa341033..f229c588f 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -31,7 +31,7 @@ char ans[MAX_STR_LENGTH];
 
 int multiSlsDetector::freeSharedMemory() {
   // Detach Memory address
-  for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+  for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
     if (detectors[id])
       detectors[id]->freeSharedMemory();
   }
@@ -103,11 +103,11 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
 
   while (shmId<0) {
     shmId=initSharedMemory(id);
-    id++;
+    ++id;
   }
-  id--;
+  --id;
 
-  for (int id=0; id<MAXDET; id++) {
+  for (int id=0; id<MAXDET; ++id) {
     detectors[id]=NULL;
   }
   if (thisMultiDetector->alreadyExisting==0) {
@@ -116,7 +116,7 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
     thisMultiDetector->onlineFlag = ONLINE_FLAG;
     thisMultiDetector->receiverOnlineFlag = OFFLINE_FLAG;
     thisMultiDetector->numberOfDetectors=0;
-    for (int id=0; id<MAXDET; id++) {
+    for (int id=0; id<MAXDET; ++id) {
       thisMultiDetector->detectorIds[id]=-1;
       thisMultiDetector->offsetX[id]=0;
       thisMultiDetector->offsetY[id]=0;
@@ -190,14 +190,14 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
     thisMultiDetector->actionMask=0;
 
 
-    for (int ia=0; ia<MAX_ACTIONS; ia++) {
+    for (int ia=0; ia<MAX_ACTIONS; ++ia) {
       //thisMultiDetector->actionMode[ia]=0;
       strcpy(thisMultiDetector->actionScript[ia],"none");
       strcpy(thisMultiDetector->actionParameter[ia],"none");
     }
 
 
-    for (int iscan=0; iscan<MAX_SCAN_LEVELS; iscan++) {
+    for (int iscan=0; iscan<MAX_SCAN_LEVELS; ++iscan) {
        
       thisMultiDetector->scanMode[iscan]=0;
       strcpy(thisMultiDetector->scanScript[iscan],"none");
@@ -253,7 +253,7 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
   fileFormatType=&thisMultiDetector->fileFormatType;
 
 
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 #ifdef VERBOSE
     cout << thisMultiDetector->detectorIds[i] << endl;
 #endif
@@ -263,7 +263,7 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
     //  setAngularConversionPointer(detectors[i]->getAngularConversionPointer(),detectors[i]->getNModsPointer(),detectors[i]->getNChans()*detectors[i]->getNChips(), i);
 
   }
- // for (int i=thisMultiDetector->numberOfDetectors; i<MAXDET; i++)
+ // for (int i=thisMultiDetector->numberOfDetectors; i<MAXDET; ++i)
    // detectors[i]=NULL;
 
 
@@ -355,7 +355,7 @@ int multiSlsDetector::addSlsDetector(int id, int pos) {
 
   //check that it is not already in the list
   
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     //check that it is not already in the list, in that case move to new position
     if (detectors[i]) {
       if (detectors[i]->getDetectorId()==id) { 
@@ -368,7 +368,7 @@ int multiSlsDetector::addSlsDetector(int id, int pos) {
 
 
   if (pos!=thisMultiDetector->numberOfDetectors) {
-    for (int ip=thisMultiDetector->numberOfDetectors-1; ip>=pos; ip--) {
+    for (int ip=thisMultiDetector->numberOfDetectors-1; ip>=pos; --ip) {
 #ifdef VERBOSE
       cout << "Moving detector " << thisMultiDetector->detectorIds[ip] << " from position " << ip << " to " << ip+1 << endl;
 #endif
@@ -382,7 +382,7 @@ int multiSlsDetector::addSlsDetector(int id, int pos) {
 
   detectors[pos]=new slsDetector(pos, id, this);
   thisMultiDetector->detectorIds[pos]=detectors[pos]->getDetectorId();
-  thisMultiDetector->numberOfDetectors++;
+  ++thisMultiDetector->numberOfDetectors;
   
   thisMultiDetector->dataBytes+=detectors[pos]->getDataBytes();
  
@@ -401,7 +401,7 @@ int multiSlsDetector::addSlsDetector(int id, int pos) {
 #ifdef VERBOSE
   cout << "Detector added " << thisMultiDetector->numberOfDetectors<< endl;
 
-  for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ip++) {
+  for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ++ip) {
     cout << "Detector " << thisMultiDetector->detectorIds[ip] << " position " << ip << " "  << detectors[ip]->getHostname() << endl;
   }
 #endif
@@ -434,7 +434,7 @@ void multiSlsDetector::updateOffsets(){//cannot paralllize due to slsdetector ca
 	thisMultiDetector->maxNumberOfChannel[Y] = 0;
 
 
-	for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 #ifdef VERBOSE
 			cout<<"offsetX:"<<offsetX<<" prevChanX:"<<prevChanX<<" offsetY:"<<offsetY<<" prevChanY:"<<prevChanY<<endl;
@@ -582,7 +582,7 @@ string multiSlsDetector::getHostname(int pos) {
     if (detectors[pos])
       return detectors[pos]->getHostname();
   } else {
-    for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ip++) {
+    for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ++ip) {
 #ifdef VERBOSE
       cout << "detector " << ip << endl;
 #endif
@@ -627,7 +627,7 @@ string multiSlsDetector::sgetDetectorsType(int pos) {
     if (detectors[pos])
       return detectors[pos]->sgetDetectorsType();
   } else {
-    for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ip++) {
+    for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ++ip) {
 #ifdef VERBOSE
       cout << "detector " << ip << endl;
 #endif
@@ -688,7 +688,7 @@ int multiSlsDetector::addSlsDetector(const char *name, int pos) {
 
 
   if (t==GENERIC) {
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       if (detectors[i]) {
 	if (detectors[i]->getHostname()==string(name)) {
 	  cout << "Detector " << name << "already part of the multiDetector in position " << i << "!" << endl<<  "Remove it before adding it back in a new position!"<< endl;
@@ -699,7 +699,7 @@ int multiSlsDetector::addSlsDetector(const char *name, int pos) {
    
     //checking that the detector doesn't already exists
     
-    for (id=0; id<MAXDET; id++) {
+    for (id=0; id<MAXDET; ++id) {
       if (slsDetector::exists(id)>0) {
 #ifdef VERBOSE
 	cout << "Detector " << id << " already exists" << endl;
@@ -709,7 +709,7 @@ int multiSlsDetector::addSlsDetector(const char *name, int pos) {
 	  break;
 	delete s;
 	s=NULL;
-	//id++;
+	//++id;
       }
     }
 
@@ -736,7 +736,7 @@ int multiSlsDetector::addSlsDetector(const char *name, int pos) {
 
 
   if (s==NULL) {
-    for (id=0; id<MAXDET; id++) {
+    for (id=0; id<MAXDET; ++id) {
       if (slsDetector::exists(id)==0) {
 	break;
       }
@@ -769,7 +769,7 @@ int multiSlsDetector::addSlsDetector(detectorType t, int pos) {
     return -1;
   }
 
-  for (id=0; id<MAXDET; id++) {
+  for (id=0; id<MAXDET; ++id) {
     if (slsDetector::exists(id)==0) {
       break;
     }
@@ -796,11 +796,11 @@ void multiSlsDetector::getNumberOfDetectors(int& nx, int& ny) {
 	int offsetx = -1, offsety = -1;
 	for (int i = 0; i < thisMultiDetector->numberOfDetectors; ++i) {
 		if (thisMultiDetector->offsetX[i] > offsetx) {
-			nx++;
+			++nx;
 			offsetx = thisMultiDetector->offsetX[i];
 		}
 		if (thisMultiDetector->offsetY[i] > offsety) {
-			ny++;
+			++ny;
 			offsety = thisMultiDetector->offsetY[i];
 		}
 	}
@@ -843,7 +843,7 @@ int multiSlsDetector::setDetectorOffset(int pos, int ox, int oy) {
 
 
 int multiSlsDetector::removeSlsDetector(char *name){
-  for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {	
+  for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
     if (detectors[id]) {						
       if (detectors[id]->getHostname()==string(name)) {			
 	removeSlsDetector(id);						
@@ -878,7 +878,7 @@ int multiSlsDetector::removeSlsDetector(int pos) {
     return thisMultiDetector->numberOfDetectors;
 
   //j=pos;
-  for (j=mi; j<ma; j++) {
+  for (j=mi; j<ma; ++j) {
     
     if (detectors[j]) {
 
@@ -888,11 +888,11 @@ int multiSlsDetector::removeSlsDetector(int pos) {
 
       delete detectors[j];
       detectors[j]=0;
-      thisMultiDetector->numberOfDetectors--;
+      --thisMultiDetector->numberOfDetectors;
 
 
       if (single) {
-	for (int i=j+1; i<thisMultiDetector->numberOfDetectors+1; i++) {
+	for (int i=j+1; i<thisMultiDetector->numberOfDetectors+1; ++i) {
 	  detectors[i-1]=detectors[i];
 	  thisMultiDetector->detectorIds[i-1]=thisMultiDetector->detectorIds[i];
 	}
@@ -933,7 +933,7 @@ int multiSlsDetector::setMaster(int i) {
       if(detectors[i]->getErrorMask())
 	setErrorMask(getErrorMask()|(1<<i));
     }
-    for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+    for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
       if (i!=id) {
 	if (detectors[id]) {
 #ifdef VERBOSE
@@ -948,7 +948,7 @@ int multiSlsDetector::setMaster(int i) {
     }
 
   } else if (i==-2) {
-    for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+    for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
       if (detectors[id]) {
 #ifdef VERBOSE
 	cout << "detector position " << id << " ";
@@ -964,7 +964,7 @@ int multiSlsDetector::setMaster(int i) {
 
   // check return value
 
-  for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+  for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
     if (detectors[id]) {
 #ifdef VERBOSE
       cout << "detector position " << id << " ";
@@ -1021,7 +1021,7 @@ slsDetectorDefs::synchronizationMode multiSlsDetector::setSynchronization(synchr
   
   synchronizationMode ret=GET_SYNCHRONIZATION_MODE, ret1=GET_SYNCHRONIZATION_MODE;
   
-  for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+  for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
     if (detectors[id]) {
       ret1=detectors[id]->setSynchronization(sync);
       if(detectors[id]->getErrorMask())
@@ -1079,7 +1079,7 @@ int multiSlsDetector::setOnline(int off) {
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func1_t<int,int>(&slsDetector::setOnline,
@@ -1089,7 +1089,7 @@ int multiSlsDetector::setOnline(int off) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -1113,7 +1113,7 @@ int multiSlsDetector::setOnline(int off) {
 
 string multiSlsDetector::checkOnline() {
   string retval1 = "",retval;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       retval=detectors[idet]->checkOnline();
       if(!retval.empty()){
@@ -1131,7 +1131,7 @@ int multiSlsDetector::activate(int const enable){
 	int i;
 	int64_t ret1=-100, ret;
 
-	for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			ret=detectors[i]->activate(enable);
 			if(detectors[i]->getErrorMask())
@@ -1175,7 +1175,7 @@ int multiSlsDetector::getThresholdEnergy(int pos) {
     posmax=pos+1;
   }
 
-  for (i=posmin; i<posmax; i++) {
+  for (i=posmin; i<posmax; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->getThresholdEnergy();
       if(detectors[i]->getErrorMask())
@@ -1213,7 +1213,7 @@ int multiSlsDetector::setThresholdEnergy(int e_eV, int pos, detectorSettings ise
 	}else{
 		//return storage values
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func4_t<int,int,int,detectorSettings,int>(&slsDetector::setThresholdEnergy,
@@ -1223,7 +1223,7 @@ int multiSlsDetector::setThresholdEnergy(int e_eV, int pos, detectorSettings ise
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -1264,7 +1264,7 @@ slsDetectorDefs::detectorSettings multiSlsDetector::getSettings(int pos) {
 	}else{
 		//return storage values
 		detectorSettings* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new detectorSettings(GET_SETTINGS);
 				Task* task = new Task(new func1_t<detectorSettings,int>(&slsDetector::getSettings,
@@ -1274,7 +1274,7 @@ slsDetectorDefs::detectorSettings multiSlsDetector::getSettings(int pos) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -1312,7 +1312,7 @@ slsDetectorDefs::detectorSettings multiSlsDetector::setSettings(detectorSettings
 	}else{
 		//return storage values
 		detectorSettings* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new detectorSettings(GET_SETTINGS);
 				Task* task = new Task(new func2_t<detectorSettings,detectorSettings,int>(&slsDetector::setSettings,
@@ -1322,7 +1322,7 @@ slsDetectorDefs::detectorSettings multiSlsDetector::setSettings(detectorSettings
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -1349,7 +1349,7 @@ int multiSlsDetector::getChanRegs(double* retval,bool fromDetector){
   int n = thisMultiDetector->numberOfChannels,nChansDet,currentNumChans=0;
   double retval1[n];
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       //  cout << "det " << idet << endl;
       nChansDet = detectors[idet]->getChanRegs(retval1,fromDetector);
@@ -1397,7 +1397,7 @@ int multiSlsDetector::prepareAcquisition(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::prepareAcquisition,
@@ -1407,7 +1407,7 @@ int multiSlsDetector::prepareAcquisition(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -1460,7 +1460,7 @@ int multiSlsDetector::cleanupAcquisition(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::cleanupAcquisition,
@@ -1470,7 +1470,7 @@ int multiSlsDetector::cleanupAcquisition(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -1506,7 +1506,7 @@ int multiSlsDetector::startAcquisition(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::startAcquisition,
@@ -1516,7 +1516,7 @@ int multiSlsDetector::startAcquisition(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -1568,7 +1568,7 @@ int multiSlsDetector::stopAcquisition(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::stopAcquisition,
@@ -1578,7 +1578,7 @@ int multiSlsDetector::stopAcquisition(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -1613,7 +1613,7 @@ int multiSlsDetector::startReadOut(){
 	ret1=FAIL;
     }
   }
-  for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->startReadOut();
       if(detectors[i]->getErrorMask())
@@ -1648,7 +1648,7 @@ int* multiSlsDetector::getDataFromDetector() {
 	p=retval;
 	//	cout << "multi: " << thisMultiDetector->dataBytes << endl;
 
-	for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+	for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
 		if (detectors[id]) {
 			retdet=detectors[id]->getDataFromDetector(p);
 			if(detectors[id]->getErrorMask())
@@ -1676,7 +1676,7 @@ int* multiSlsDetector::getDataFromDetector() {
 	}
 
 	if (nodatadet>=0) {
-		for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+		for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
 			if (id!=nodatadet) {
 				if (detectors[id]) {
 //#ifdef VERBOSE
@@ -1718,7 +1718,7 @@ int* multiSlsDetector::readFrame(){
   
   /** probably it's always better to have one integer per channel in any case! */
 
-  for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+  for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
     if (detectors[id]) {
       retdet=detectors[id]->readFrame();
       if(detectors[id]->getErrorMask())
@@ -1760,7 +1760,7 @@ int* multiSlsDetector::readAll(){
 #endif
   if (thisMultiDetector->onlineFlag==ONLINE_FLAG) {
     
-    for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+    for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
       if (detectors[id]) {
 	detectors[id]->readAllNoWait();
 	if(detectors[id]->getErrorMask())
@@ -1768,7 +1768,7 @@ int* multiSlsDetector::readAll(){
       }
     }
     while ((retval=getDataFromDetector())){
-      i++;
+      ++i;
 #ifdef VERBOSE
       std::cout<< i << std::endl;
       //#else
@@ -1776,7 +1776,7 @@ int* multiSlsDetector::readAll(){
 #endif
       dataQueue.push(retval);
     }
-    for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+    for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
       if (detectors[id]) {
 	detectors[id]->disconnectControl();
       }
@@ -1812,7 +1812,7 @@ int* multiSlsDetector::startAndReadAll(){
 	  startAndReadAllNoWait();
    
     while ((retval=getDataFromDetector())){
-      i++;
+      ++i;
 #ifdef VERBOSE
       std::cout<< i << std::endl;
       //#else
@@ -1821,7 +1821,7 @@ int* multiSlsDetector::startAndReadAll(){
       dataQueue.push(retval);
     }
 
-    for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
+    for (int id=0; id<thisMultiDetector->numberOfDetectors; ++id) {
       if (detectors[id]) {
 	detectors[id]->disconnectControl();
       }
@@ -1851,7 +1851,7 @@ int multiSlsDetector::startAndReadAllNoWait(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::startAndReadAllNoWait,
@@ -1861,7 +1861,7 @@ int multiSlsDetector::startAndReadAllNoWait(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -1907,7 +1907,7 @@ slsDetectorDefs::runStatus  multiSlsDetector::getRunStatus() {
       return s;
     }
 
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     s1=detectors[i]->getRunStatus(); 
     if(detectors[i]->getErrorMask())
       setErrorMask(getErrorMask()|(1<<i));
@@ -1985,7 +1985,7 @@ int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t){
 	}else{
 		//return storage values
 		int64_t* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int64_t(-1);
 				Task* task = new Task(new func2_t<int64_t,timerIndex,int64_t>(&slsDetector::setTimer,
@@ -1995,7 +1995,7 @@ int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -2033,7 +2033,7 @@ int64_t multiSlsDetector::getTimeLeft(timerIndex index){
       return ret1;
     }
   
-  for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->getTimeLeft(index);
       if(detectors[i]->getErrorMask())
@@ -2057,7 +2057,7 @@ int multiSlsDetector::setSpeed(speedVariable index, int value){
   
 
   
-  for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->setSpeed(index,value);
       if(detectors[i]->getErrorMask())
@@ -2087,7 +2087,7 @@ int multiSlsDetector::setSpeed(speedVariable index, int value){
 
 int  multiSlsDetector::getDataBytes(){
   int ret=0;   
-  for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ip++) {
+  for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ++ip) {
     if (detectors[ip]) 
       ret+=detectors[ip]->getDataBytes();
   }
@@ -2114,7 +2114,7 @@ int multiSlsDetector::setDynamicRange(int n, int pos){
     ima=pos+1;
   }
  
-  for (i=imi; i<ima; i++) {
+  for (i=imi; i<ima; ++i) {
     //  cout << "multi ************ detector " << i << endl;
 
     if (detectors[i]) {
@@ -2150,7 +2150,7 @@ int multiSlsDetector::setDynamicRange(int n, int pos){
 
 void multiSlsDetector::verifyMinMaxROI(int n, ROI r[]){
 	int temp;
-	for(int i=0;i<n;i++){
+	for(int i=0;i<n;++i){
 		if ((r[i].xmax) < (r[i].xmin)){
 			temp=r[i].xmax;
 			r[i].xmax=r[i].xmin;
@@ -2171,7 +2171,7 @@ int multiSlsDetector::decodeNChannel(int offsetX, int offsetY, int &channelX, in
 	channelX=-1;
 	channelY=-1;
 	//loop over
-	for(int i=0;i<thisMultiDetector->numberOfDetectors;i++){
+	for(int i=0;i<thisMultiDetector->numberOfDetectors;++i){
 		if (detectors[i]) {
 			//check x offset range
 			if ((offsetX >= thisMultiDetector->offsetX[i]) && (offsetX < (thisMultiDetector->offsetX[i]+detectors[i]->getMaxNumberOfChannels(X)))){
@@ -2200,7 +2200,7 @@ int multiSlsDetector::setROI(int n,ROI roiLimits[]){
 	int ndet = thisMultiDetector->numberOfDetectors;
 	ROI allroi[ndet][n];
 	int nroi[ndet];
-	for(i=0;i<ndet;i++) nroi[i]=0;
+	for(i=0;i<ndet;++i) nroi[i]=0;
 
 
 	if ((n < 0) || (roiLimits == NULL))
@@ -2210,11 +2210,11 @@ int multiSlsDetector::setROI(int n,ROI roiLimits[]){
 	verifyMinMaxROI(n,roiLimits);
 #ifdef VERBOSE
 	cout<<"Setting ROI for "<< n << "rois:"<<endl;
-	for(i=0;i<n;i++)
+	for(i=0;i<n;++i)
 		cout<<i<<":"<<roiLimits[i].xmin<<"\t"<<roiLimits[i].xmax<<"\t"<<roiLimits[i].ymin<<"\t"<<roiLimits[i].ymax<<endl;
 #endif
 	//for each roi
-	for(i=0;i<n;i++){
+	for(i=0;i<n;++i){
 		xmin = roiLimits[i].xmin;
 		xmax = roiLimits[i].xmax;
 		ymin = roiLimits[i].ymin;
@@ -2294,16 +2294,16 @@ int multiSlsDetector::setROI(int n,ROI roiLimits[]){
 
 #ifdef VERBOSE
 		cout<<"Setting ROI :"<<endl;
-		for(i=0;i<thisMultiDetector->numberOfDetectors;i++){
+		for(i=0;i<thisMultiDetector->numberOfDetectors;++i){
 			cout<<"detector "<<i<<endl;
-			for(int j=0;j<nroi[i];j++){
+			for(int j=0;j<nroi[i];++j){
 				cout<<allroi[i][j].xmin<<"\t"<<allroi[i][j].xmax<<"\t"<<allroi[i][j].ymin<<"\t"<<allroi[i][j].ymax<<endl;
 			}
 		}
 #endif
 
 	//settings the rois for each detector
-	for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]){
 #ifdef VERBOSE
 			cout << "detector " << i << ":" << endl;
@@ -2336,7 +2336,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 	int index=0;
 
 	//get each detector's roi array
-	for (i=0; i<thisMultiDetector->numberOfDetectors; i++){
+	for (i=0; i<thisMultiDetector->numberOfDetectors; ++i){
 		if (detectors[i]){
 			temp = detectors[i]->getROI(index);
 			if(detectors[i]->getErrorMask())
@@ -2347,7 +2347,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 				if(index)
 					cout << "detector " << i << ":" << endl;
 //#endif
-				for(j=0;j<index;j++){
+				for(j=0;j<index;++j){
 //#ifdef VERBOSE
 					cout<<temp[j].xmin<<"\t"<<temp[j].xmax<<"\t"<<temp[j].ymin<<"\t"<<temp[j].ymax<<endl;
 //#endif
@@ -2355,7 +2355,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 					roiLimits[n].xmax = temp[j].xmax + thisMultiDetector->offsetX[i];
 					roiLimits[n].ymin = temp[j].ymin + thisMultiDetector->offsetY[i];
 					roiLimits[n].ymax = temp[j].ymin + thisMultiDetector->offsetY[i];
-					n++;
+					++n;
 				}
 			}
 		}
@@ -2370,7 +2370,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 
 #ifdef VERBOSE
 	cout<<"ROI :"<<endl;
-		for(int j=0;j<n;j++){
+		for(int j=0;j<n;++j){
 			cout<<roiLimits[j].xmin<<"\t"<<roiLimits[j].xmax<<"\t"<<roiLimits[j].ymin<<"\t"<<roiLimits[j].ymax<<endl;
 		}
 #endif
@@ -2379,11 +2379,11 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 
 
 	//combine all the adjacent rois in x direction
-	for(i=0;i<n;i++){
+	for(i=0;i<n;++i){
 		//since the ones combined are replaced by -1
 		if ((roiLimits[i].xmin) == -1)
 			continue;
-		for(j=i+1;j<n;j++){
+		for(j=i+1;j<n;++j){
 			//since the ones combined are replaced by -1
 			if ((roiLimits[j].xmin) == -1)
 				continue;
@@ -2412,17 +2412,17 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 #ifdef VERBOSE
 	cout<<"Combined along x axis Getting ROI :"<<endl;
 		cout<<"detector "<<i<<endl;
-		for(int j=0;j<n;j++){
+		for(int j=0;j<n;++j){
 			cout<<roiLimits[j].xmin<<"\t"<<roiLimits[j].xmax<<"\t"<<roiLimits[j].ymin<<"\t"<<roiLimits[j].ymax<<endl;
 		}
 #endif
 
 	//combine all the adjacent rois in y direction
-	for(i=0;i<n;i++){
+	for(i=0;i<n;++i){
 		//since the ones combined are replaced by -1
 		if ((roiLimits[i].ymin) == -1)
 			continue;
-		for(j=i+1;j<n;j++){
+		for(j=i+1;j<n;++j){
 			//since the ones combined are replaced by -1
 			if ((roiLimits[j].ymin) == -1)
 				continue;
@@ -2449,15 +2449,15 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 	}
 
 	// get rid of -1s
-	for(i=0;i<n;i++){
+	for(i=0;i<n;++i){
 		if((roiLimits[i].xmin)!=-1){
 			retval[num] = roiLimits[i];
-			num++;
+			++num;
 		}
 	}
 	//sort final roi
-	for(i=0;i<num;i++){
-		for(j=i+1;j<num;j++){
+	for(i=0;i<num;++i){
+		for(j=i+1;j<num;++j){
 			if(retval[j].xmin<retval[i].xmin){
 				temproi = retval[i];
 				retval[i] = retval[j];
@@ -2468,7 +2468,7 @@ slsDetectorDefs::ROI* multiSlsDetector::getROI(int &n){
 	n = num;
 
 	cout<<"\nxmin\txmax\tymin\tymax"<<endl;
-	for(i=0;i<n;i++)
+	for(i=0;i<n;++i)
 		cout<<retval[i].xmin<<"\t"<<retval[i].xmax<<"\t"<<retval[i].ymin<<"\t"<<retval[i].ymax<<endl;
 	return retval;
 }
@@ -2495,7 +2495,7 @@ double* multiSlsDetector::decodeData(int *datain, int &nn, double *fdata) {
   double *detp=dataout;
   int  *datap=datain;
 
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       detectors[i]->decodeData(datap, n, detp);
       if(detectors[i]->getErrorMask())
@@ -2513,9 +2513,9 @@ double* multiSlsDetector::decodeData(int *datain, int &nn, double *fdata) {
 #ifdef VERBOSE
       cout << "done " << endl;
 #endif
-      //       for (int j=0; j<detectors[i]->getTotalNumberOfChannels(); j++) {
+      //       for (int j=0; j<detectors[i]->getTotalNumberOfChannels(); ++j) {
       // 	dataout[ich]=detp[j];
-      // 	ich++;
+      // 	++ich;
       //       }
       //delete [] detp;
     }
@@ -2581,7 +2581,7 @@ int multiSlsDetector::setFlatFieldCorrection(string fname){
 #endif
     thisMultiDetector->correctionMask&=~(1<<FLAT_FIELD_CORRECTION);
     //  strcpy(thisMultiDetector->flatFieldFile,"none");
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       if (detectors[i]){
 	detectors[i]->setFlatFieldCorrection(NULL, NULL);
 	if(detectors[i]->getErrorMask())
@@ -2604,7 +2604,7 @@ int multiSlsDetector::setFlatFieldCorrection(string fname){
       int nm=getNMods();
       int chpm[nm];
       int mMask[nm];
-      for (int i=0; i<nm; i++) {
+      for (int i=0; i<nm; ++i) {
 	chpm[i]=getChansPerMod(i);
 	mMask[i]=i;
 	//	cout << "multi chpm " << im << " " << chpm[im] << endl;
@@ -2633,11 +2633,11 @@ int multiSlsDetector::setFlatFieldCorrection(string fname){
 int multiSlsDetector::fillModuleMask(int *mM) {
   int imod=0, off=0;
   if (mM) {
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       if (detectors[i]) {
-	for (int im=0; im<detectors[i]->getNMods(); im++) {
+	for (int im=0; im<detectors[i]->getNMods(); ++im) {
 	  mM[imod]=im+off;
-	  imod++;
+	  ++imod;
 	}
 	off+=detectors[i]->getMaxMods();
       }
@@ -2653,7 +2653,7 @@ int multiSlsDetector::fillModuleMask(int *mM) {
 int multiSlsDetector::setFlatFieldCorrection(double *corr, double *ecorr) {
   int ichdet=0;
   double *p, *ep;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       if (corr!=NULL)
 	p=corr+ichdet;
@@ -2684,7 +2684,7 @@ int multiSlsDetector::getFlatFieldCorrection(double *corr, double *ecorr) {
   int ichdet=0;
   double *p, *ep;
   int ff=1, dff;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       if (corr!=NULL)
 	p=corr+ichdet;
@@ -2721,7 +2721,7 @@ int multiSlsDetector::getFlatFieldCorrection(double *corr, double *ecorr) {
 
 int multiSlsDetector::getNMods(){
   int nm=0;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       nm+=detectors[idet]->getNMods();
     }
@@ -2736,7 +2736,7 @@ int multiSlsDetector::getNMods(){
 
 int multiSlsDetector::getNMod(dimension d){
   int nm=0;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       nm+=detectors[idet]->getNMod(d);
     }
@@ -2800,7 +2800,7 @@ int multiSlsDetector::flatFieldCorrect(double* datain, double *errin, double* da
 
   int ichdet=0;
   double *perr=errin;//*pdata,
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
 #ifdef VERBOSE
       cout << " detector " << idet << " offset " << ichdet << endl;
@@ -2831,7 +2831,7 @@ int multiSlsDetector::setRateCorrection(double t){
 
 	if (getDetectorsType() == EIGER){
 		int ret = OK, ret1= OK;
-		for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+		for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 			if (detectors[idet]) {
 				ret=detectors[idet]->setRateCorrection(t);
 				if(detectors[idet]->getErrorMask())
@@ -2851,7 +2851,7 @@ int multiSlsDetector::setRateCorrection(double t){
 		thisMultiDetector->correctionMask|=(1<<RATE_CORRECTION);
 
 	int ret, ret1=-100;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret=detectors[idet]->setRateCorrection(t);
 			if(detectors[idet]->getErrorMask())
@@ -2890,7 +2890,7 @@ int multiSlsDetector::getRateCorrection(double &t){
 double multiSlsDetector::getRateCorrectionTau(){
 
 	double ret1=-100,ret;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret=detectors[idet]->getRateCorrectionTau();
 			if (ret1==-100)
@@ -2943,7 +2943,7 @@ int multiSlsDetector::rateCorrect(double* datain, double *errin, double* dataout
 
   int ichdet=0;
   double *perr=errin;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       if (errin)
 	perr+=ichdet;
@@ -3004,7 +3004,7 @@ int multiSlsDetector::setBadChannelCorrection(int nbad, int *badlist, int ff) {
   if (nbad>0) {
     thisMultiDetector->correctionMask|=(1<<DISCARD_BAD_CHANNELS);
     
-    for (int ich=0; ich<nbad; ich++) {
+    for (int ich=0; ich<nbad; ++ich) {
       if (detectors[idet]) {
 	if ((badlist[ich]-choff)>=detectors[idet]->getMaxNumberOfChannels()) {
 	  //#ifdef VERBOSE
@@ -3015,12 +3015,12 @@ int multiSlsDetector::setBadChannelCorrection(int nbad, int *badlist, int ff) {
 	    setErrorMask(getErrorMask()|(1<<idet));
 	  choff+=detectors[idet]->getMaxNumberOfChannels();
 	  nbaddet=0;
-	  idet++;
+	  ++idet;
 	  if (detectors[idet]==NULL)
 	    break;
 	}
 	badlistdet[nbaddet]=(badlist[ich]-choff);
-	nbaddet++;
+	++nbaddet;
 #ifdef VERBOSE
 	cout << nbaddet << " " << badlist[ich] << " " << badlistdet[nbaddet-1] << endl;
 #endif
@@ -3037,11 +3037,11 @@ int multiSlsDetector::setBadChannelCorrection(int nbad, int *badlist, int ff) {
 	  setErrorMask(getErrorMask()|(1<<idet));
 	choff+=detectors[idet]->getMaxNumberOfChannels();
 	nbaddet=0;
-	idet++;
+	++idet;
       }
     }
     nbaddet=0;
-    for (int i=idet; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=idet; i<thisMultiDetector->numberOfDetectors; ++i) {
  #ifdef VERBOSE
       cout << "setting " << 0 << " badchans to detector " << i << endl;
  #endif
@@ -3054,7 +3054,7 @@ int multiSlsDetector::setBadChannelCorrection(int nbad, int *badlist, int ff) {
     
   } else {
     nbaddet=0;
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       if (detectors[idet]) {
 #ifdef VERBOSE
 	cout << "setting " << 0 << " badchans to detector " << idet << endl;
@@ -3086,7 +3086,7 @@ int multiSlsDetector::readAngularConversionFile(string fname) {
   infile.open(fname.c_str(), ios_base::in);
   if (infile.is_open()) {
 
-    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
       if (detectors[idet]) {
 #ifdef VERBOSE
 	cout << " detector " << idet << endl;
@@ -3114,7 +3114,7 @@ int multiSlsDetector::writeAngularConversion(string fname) {
   outfile.open(fname.c_str(), ios_base::out);
   if (outfile.is_open()) {
 
-    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
       if (detectors[idet]) {
 	detectors[idet]->writeAngularConversion(outfile);
 	if(detectors[idet]->getErrorMask())
@@ -3135,7 +3135,7 @@ int  multiSlsDetector::getAngularConversion(int &direction,  angleConversionCons
   int dir=-100, dir1;
   angleConversionConstant *a1=angconv;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       detectors[idet]->getAngularConversion(dir1,a1);
       if(detectors[idet]->getErrorMask())
@@ -3198,7 +3198,7 @@ dacs_t multiSlsDetector::setDAC(dacs_t val, dacIndex idac, int mV, int imod) {
 	}
 	threadpool->startExecuting();
 	threadpool->wait_for_tasks_to_complete();
-	for(int idet=posmin; idet<posmax; idet++){
+	for(int idet=posmin; idet<posmax; ++idet){
 		if(detectors[idet]){
 			if(iret[idet] != NULL){
 
@@ -3260,7 +3260,7 @@ dacs_t multiSlsDetector::getADC(dacIndex idac, int imod) {
 	}
 	threadpool->startExecuting();
 	threadpool->wait_for_tasks_to_complete();
-	for(int idet=posmin; idet<posmax; idet++){
+	for(int idet=posmin; idet<posmax; ++idet){
 		if(detectors[idet]){
 			if(iret[idet] != NULL){
 				if (ret==-100)
@@ -3286,7 +3286,7 @@ int multiSlsDetector::setChannel(int64_t reg, int ichan, int ichip, int imod) {
     dmi=id;
     dma=id+1;
   }
-  for (int idet=dmi; idet<dma; idet++) {
+  for (int idet=dmi; idet<dma; ++idet) {
     if (detectors[idet]) {
       ret=detectors[idet]->setChannel(reg, ichan, ichip, im);
       if(detectors[idet]->getErrorMask())
@@ -3312,7 +3312,7 @@ int multiSlsDetector::setChannel(int64_t reg, int ichan, int ichip, int imod) {
 
 double multiSlsDetector::setAngularConversionParameter(angleConversionParameter c, double v) {
   double ret=slsDetectorUtils::setAngularConversionParameter(c,v);
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     
     if (detectors[idet]) {
 	
@@ -3333,7 +3333,7 @@ double multiSlsDetector::setAngularConversionParameter(angleConversionParameter
 //   double *p=ang;
 //   int choff=0;
 
-//   for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+//   for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     
 //     if (detectors[idet]) {
 // #ifdef EPICS
@@ -3365,7 +3365,7 @@ int multiSlsDetector::getBadChannelCorrection(int *bad) {
   //else
   // cout << "bad chans corr enabled "<< thisMultiDetector->correctionMask << endl;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       nd=detectors[idet]->getBadChannelCorrection();
       //  cout << "det " << idet << " nbad " << nd << endl;
@@ -3375,10 +3375,10 @@ int multiSlsDetector::getBadChannelCorrection(int *bad) {
 	if(detectors[idet]->getErrorMask())
 	  setErrorMask(getErrorMask()|(1<<idet));
 
-	for (int id=0; id<nd; id++) {
+	for (int id=0; id<nd; ++id) {
 	  if (bd[id]<detectors[idet]->getTotalNumberOfChannels()) {
 	    if (bad) bad[ntot]=choff+bd[id];
-	    ntot++;
+	    ++ntot;
 	  }
 	}
 	choff+=detectors[idet]->getTotalNumberOfChannels();
@@ -3396,7 +3396,7 @@ int multiSlsDetector::getBadChannelCorrection(int *bad) {
 int multiSlsDetector::exitServer() {
 
   int ival=FAIL, iv;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       iv=detectors[idet]->exitServer();
       if (iv==OK)
@@ -3413,7 +3413,7 @@ char* multiSlsDetector::getSettingsDir() {
   
 
   //char ans[1000];
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       s=detectors[idet]->getSettingsDir();
       if(detectors[idet]->getErrorMask())
@@ -3442,7 +3442,7 @@ char* multiSlsDetector::getSettingsDir() {
 char* multiSlsDetector::setSettingsDir(string s){
 
   if (s.find('+')==string::npos) {
-    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
       if (detectors[idet]) {
 	detectors[idet]->setSettingsDir(s);
       if(detectors[idet]->getErrorMask())
@@ -3460,7 +3460,7 @@ char* multiSlsDetector::setSettingsDir(string s){
        if(detectors[id]->getErrorMask())
 	setErrorMask(getErrorMask()|(1<<id));
      }
-      id++;
+      ++id;
       s=s.substr(p2+1);
       p2=s.find('+');
       if (id>=thisMultiDetector->numberOfDetectors)
@@ -3480,7 +3480,7 @@ int multiSlsDetector::setTrimEn(int ne, int *ene) {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->setTrimEn(ne,ene);
       if(detectors[idet]->getErrorMask())
@@ -3501,7 +3501,7 @@ int multiSlsDetector::getTrimEn(int *ene) {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->getTrimEn(ene);
       if(detectors[idet]->getErrorMask())
@@ -3531,7 +3531,7 @@ int multiSlsDetector::getTrimEn(int *ene) {
 char* multiSlsDetector::getCalDir() {
   string s0="", s1="", s;
   //char ans[1000];
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       s=detectors[idet]->getCalDir();
       if(detectors[idet]->getErrorMask())
@@ -3562,7 +3562,7 @@ char* multiSlsDetector::getCalDir() {
 char* multiSlsDetector::setCalDir(string s){
 
   if (s.find('+')==string::npos) {
-    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
       if (detectors[idet]) {
 	detectors[idet]->setCalDir(s);
         if(detectors[idet]->getErrorMask())
@@ -3580,7 +3580,7 @@ char* multiSlsDetector::setCalDir(string s){
 	if(detectors[id]->getErrorMask())
 	  setErrorMask(getErrorMask()|(1<<id));
       }
-      id++;
+      ++id;
       s=s.substr(p2+1);
       p2=s.find('+');
       if (id>=thisMultiDetector->numberOfDetectors)
@@ -3600,7 +3600,7 @@ string multiSlsDetector::getNetworkParameter(networkParameter p) {
   string s0="", s1="",s ;
   string ans="";
   //char ans[1000];
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       s=detectors[idet]->getNetworkParameter(p);
       if(detectors[idet]->getErrorMask())
@@ -3646,7 +3646,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 			return getNetworkParameter(p);
 		}else{
 			string* sret[thisMultiDetector->numberOfDetectors];
-			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 				if(detectors[idet]){
 					if (p == RECEIVER_STREAMING_PORT)
 						s.append("multi\0");
@@ -3658,7 +3658,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 			}
 			threadpool->startExecuting();
 			threadpool->wait_for_tasks_to_complete();
-			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 				if(detectors[idet]){
 					if(sret[idet]!= NULL)
 						delete sret[idet];
@@ -3682,7 +3682,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 				if(detectors[id]->getErrorMask())
 					setErrorMask(getErrorMask()|(1<<id));
 			}
-			id++;
+			++id;
 			s=s.substr(p2+1);
 			p2=s.find('+');
 			if (id>=thisMultiDetector->numberOfDetectors)
@@ -3703,7 +3703,7 @@ int multiSlsDetector::setPort(portType t, int p) {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->setPort(t,p);
       if(detectors[idet]->getErrorMask())
@@ -3722,7 +3722,7 @@ int multiSlsDetector::lockServer(int p) {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->lockServer(p);
       if(detectors[idet]->getErrorMask())
@@ -3741,7 +3741,7 @@ int multiSlsDetector::lockServer(int p) {
 string multiSlsDetector::getLastClientIP() {
   string s0="", s1="",s ;
   
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       s=detectors[idet]->getLastClientIP();
       if(detectors[idet]->getErrorMask())
@@ -3772,7 +3772,7 @@ int multiSlsDetector::setReadOutFlags(readOutFlags flag) {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->setReadOutFlags(flag);
       if(detectors[idet]->getErrorMask())
@@ -3800,7 +3800,7 @@ slsDetectorDefs::externalCommunicationMode multiSlsDetector::setExternalCommunic
       setErrorMask(getErrorMask()|(1<<0));
 
   
-  for (int idet=1; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=1; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->setExternalCommunicationMode(pol);
       if(detectors[idet]->getErrorMask())
@@ -3827,7 +3827,7 @@ slsDetectorDefs::externalSignalFlag multiSlsDetector::setExternalSignalFlags(ext
     if(detectors[0]->getErrorMask())
       setErrorMask(getErrorMask()|(1<<0));
 
-  for (int idet=1; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=1; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->setExternalSignalFlags(pol,signalindex);
       if(detectors[idet]->getErrorMask())
@@ -3859,7 +3859,7 @@ const char * multiSlsDetector::getSettingsFile() {
 
   string s0="", s1="",s ;
   
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       s=detectors[idet]->getSettingsFile();
       if(detectors[idet]->getErrorMask())
@@ -3887,7 +3887,7 @@ int multiSlsDetector::configureMAC() {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->configureMAC();
 	  if(detectors[idet]->getErrorMask())
@@ -3920,7 +3920,7 @@ int multiSlsDetector::loadImageToDetector(imageType index,string const fname){
       std::cout<<"Gain";
     std::cout<<" image from file " << fname << std::endl;
 #endif
-    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
       if (detectors[idet]) {
   	if(detectors[idet]->readDataFile(infile,imageVals)>=0){
 	  ret1=detectors[idet]->sendImageToDetector(index,imageVals);
@@ -3954,7 +3954,7 @@ int multiSlsDetector::writeCounterBlockFile(string const fname,int startACQ){
       std::cout<<"\" and Restarting Acquisition";
     std::cout<<std::endl;
 #endif
-    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
       if (detectors[idet]) {
 	ret1=detectors[idet]->getCounterBlock(arg,startACQ);
 	if(ret1!=OK)
@@ -3980,7 +3980,7 @@ int multiSlsDetector::writeCounterBlockFile(string const fname,int startACQ){
 int multiSlsDetector::resetCounterBlock(int startACQ){
 
   int ret=-100, ret1;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->resetCounterBlock(startACQ);
       if(detectors[idet]->getErrorMask())
@@ -3998,7 +3998,7 @@ int multiSlsDetector::resetCounterBlock(int startACQ){
 
 int multiSlsDetector::setCounterBit(int i){
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 			ret1=detectors[idet]->setCounterBit(i);
 		    if(detectors[idet]->getErrorMask())
@@ -4020,7 +4020,7 @@ int multiSlsDetector::setDynamicRange(int p) {
   thisMultiDetector->dataBytes=0;
   thisMultiDetector->numberOfChannels=0;
   
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->setDynamicRange(p);
       if(detectors[idet]->getErrorMask())
@@ -4055,7 +4055,7 @@ int multiSlsDetector::getMaxMods() {
 
   int ret=0, ret1;
   
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->getMaxMods();
 #ifdef VERBOSE
@@ -4075,14 +4075,14 @@ int multiSlsDetector::getMaxMods() {
 
 
 
-  int multiSlsDetector::getTotalNumberOfChannels(){thisMultiDetector->numberOfChannels=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; id++) thisMultiDetector->numberOfChannels+=detectors[id]->getTotalNumberOfChannels(); return thisMultiDetector->numberOfChannels;};
+  int multiSlsDetector::getTotalNumberOfChannels(){thisMultiDetector->numberOfChannels=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; ++id) thisMultiDetector->numberOfChannels+=detectors[id]->getTotalNumberOfChannels(); return thisMultiDetector->numberOfChannels;};
 
-  //int multiSlsDetector::getTotalNumberOfChannels(dimension d){thisMultiDetector->numberOfChannel[d]=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; id++) thisMultiDetector->numberOfChannel[d]+=detectors[id]->getTotalNumberOfChannels(d); return thisMultiDetector->numberOfChannel[d];};
+  //int multiSlsDetector::getTotalNumberOfChannels(dimension d){thisMultiDetector->numberOfChannel[d]=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; ++id) thisMultiDetector->numberOfChannel[d]+=detectors[id]->getTotalNumberOfChannels(d); return thisMultiDetector->numberOfChannel[d];};
   int multiSlsDetector::getTotalNumberOfChannels(dimension d){return thisMultiDetector->numberOfChannel[d];};
 
-  int multiSlsDetector::getMaxNumberOfChannels(){thisMultiDetector->maxNumberOfChannels=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; id++) thisMultiDetector->maxNumberOfChannels+=detectors[id]->getMaxNumberOfChannels();return thisMultiDetector->maxNumberOfChannels;};
+  int multiSlsDetector::getMaxNumberOfChannels(){thisMultiDetector->maxNumberOfChannels=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; ++id) thisMultiDetector->maxNumberOfChannels+=detectors[id]->getMaxNumberOfChannels();return thisMultiDetector->maxNumberOfChannels;};
 
- // int multiSlsDetector::getMaxNumberOfChannels(dimension d){thisMultiDetector->maxNumberOfChannel[d]=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; id++) thisMultiDetector->maxNumberOfChannel[d]+=detectors[id]->getMaxNumberOfChannels(d);return thisMultiDetector->maxNumberOfChannel[d];};
+ // int multiSlsDetector::getMaxNumberOfChannels(dimension d){thisMultiDetector->maxNumberOfChannel[d]=0; for (int id=0; id< thisMultiDetector->numberOfDetectors; ++id) thisMultiDetector->maxNumberOfChannel[d]+=detectors[id]->getMaxNumberOfChannels(d);return thisMultiDetector->maxNumberOfChannel[d];};
   int multiSlsDetector::getMaxNumberOfChannels(dimension d){return thisMultiDetector->maxNumberOfChannel[d];};
 
 
@@ -4094,7 +4094,7 @@ int multiSlsDetector::getMaxMod(dimension d){
 
   int ret=0, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->getNMaxMod(d);
 #ifdef VERBOSE
@@ -4116,7 +4116,7 @@ int multiSlsDetector::getMaxNumberOfModules(dimension d) {
 
   int ret=0, ret1;
   
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->getMaxNumberOfModules(d);
       ret+=ret1;
@@ -4129,7 +4129,7 @@ int multiSlsDetector::getMaxNumberOfModules(dimension d) {
 
 int multiSlsDetector::getFlippedData(dimension d){
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 			ret1=detectors[idet]->getFlippedData(d);
 			if(ret==-100)
@@ -4148,7 +4148,7 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) {
   thisMultiDetector->dataBytes=0;
   thisMultiDetector->numberOfChannels=0;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 
     //   cout << "detector " << idet << endl;
     if (detectors[idet]) {
@@ -4183,7 +4183,7 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) {
 
 int multiSlsDetector::setFlippedData(dimension d, int value){
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 			ret1=detectors[idet]->setFlippedData(d,value);
 			if(ret==-100)
@@ -4213,7 +4213,7 @@ int multiSlsDetector::decodeNMod(int i, int &id, int &im) {
     return -1;
   }
   int nm;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       nm=detectors[idet]->getNMods();
       if (nm>i) {
@@ -4304,7 +4304,7 @@ int multiSlsDetector::executeTrimming(trimMode mode, int par1, int par2, int imo
 	}
 
 	int* iret[thisMultiDetector->numberOfDetectors];
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			iret[idet]= new int(-1);
 			Task* task = new Task(new func4_t<int,trimMode,int,int,int>(&slsDetector::executeTrimming,
@@ -4314,7 +4314,7 @@ int multiSlsDetector::executeTrimming(trimMode mode, int par1, int par2, int imo
 	}
 	threadpool->startExecuting();
 	threadpool->wait_for_tasks_to_complete();
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			if(iret[idet] != NULL){
 				if (ret==-100)
@@ -4336,7 +4336,7 @@ int multiSlsDetector::executeTrimming(trimMode mode, int par1, int par2, int imo
 int multiSlsDetector::programFPGA(string fname){
 	int ret=OK, ret1=OK;
 
-	for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			ret=detectors[i]->programFPGA(fname);
 			if(detectors[i]->getErrorMask())
@@ -4353,7 +4353,7 @@ int multiSlsDetector::programFPGA(string fname){
 int multiSlsDetector::resetFPGA(){
 	int ret=OK, ret1=OK;
 
-	for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			ret=detectors[i]->resetFPGA();
 			if(detectors[i]->getErrorMask())
@@ -4370,7 +4370,7 @@ int multiSlsDetector::resetFPGA(){
 int multiSlsDetector::powerChip(int ival){
 	int ret=OK, ret1=OK;
 
-	for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			ret=detectors[i]->powerChip(ival);
 			if(detectors[i]->getErrorMask())
@@ -4407,7 +4407,7 @@ int multiSlsDetector::loadSettingsFile(string fname, int imod) {
 	}
 
 	int* iret[thisMultiDetector->numberOfDetectors];
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			iret[idet]= new int(OK);
 			Task* task = new Task(new func2_t<int,string,int>(&slsDetector::loadSettingsFile,
@@ -4417,7 +4417,7 @@ int multiSlsDetector::loadSettingsFile(string fname, int imod) {
 	}
 	threadpool->startExecuting();
 	threadpool->wait_for_tasks_to_complete();
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			if(iret[idet] != NULL){
 				if(*iret[idet] != OK)
@@ -4445,7 +4445,7 @@ int multiSlsDetector::saveSettingsFile(string fname, int imod) {
 		}
 		return -1;
 	}
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret=detectors[idet]->saveSettingsFile(fname, imod);
 			if(detectors[idet]->getErrorMask())
@@ -4481,7 +4481,7 @@ int multiSlsDetector::setAllTrimbits(int val, int imod){
 		return -1;
 	}
 	int* iret[thisMultiDetector->numberOfDetectors];
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			iret[idet]= new int(-1);
 			Task* task = new Task(new func2_t<int,int,int>(&slsDetector::setAllTrimbits,
@@ -4491,7 +4491,7 @@ int multiSlsDetector::setAllTrimbits(int val, int imod){
 	}
 	threadpool->startExecuting();
 	threadpool->wait_for_tasks_to_complete();
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			if(iret[idet] != NULL){
 				if (ret==-100)
@@ -4535,7 +4535,7 @@ int multiSlsDetector::loadCalibrationFile(string fname, int imod) {
 	}
 
 	int* iret[thisMultiDetector->numberOfDetectors];
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			iret[idet]= new int(OK);
 			Task* task = new Task(new func2_t<int,string,int>(&slsDetector::loadCalibrationFile,
@@ -4545,7 +4545,7 @@ int multiSlsDetector::loadCalibrationFile(string fname, int imod) {
 	}
 	threadpool->startExecuting();
 	threadpool->wait_for_tasks_to_complete();
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			if(iret[idet] != NULL){
 				if(*iret[idet] != OK)
@@ -4573,7 +4573,7 @@ int multiSlsDetector::saveCalibrationFile(string fname, int imod) {
 		}
 		return -1;
 	}
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret=detectors[idet]->saveCalibrationFile(fname, imod);
 			if(detectors[idet]->getErrorMask())
@@ -4592,7 +4592,7 @@ int multiSlsDetector::writeRegister(int addr, int val){
   int  i;//imi, ima,
   int ret, ret1=-100;
 
-  for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->writeRegister(addr,val);
       if(detectors[i]->getErrorMask())
@@ -4614,7 +4614,7 @@ int multiSlsDetector::writeAdcRegister(int addr, int val){
   int  i;//imi, ima,
   int ret, ret1=-100;
 
-  for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->writeAdcRegister(addr,val);
       if(detectors[i]->getErrorMask())
@@ -4635,7 +4635,7 @@ int multiSlsDetector::readRegister(int addr){
   int  i;//imi, ima,
   int ret, ret1=-100;
 
-  for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+  for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
     if (detectors[i]) {
       ret=detectors[i]->readRegister(addr);
       if(detectors[i]->getErrorMask())
@@ -4659,7 +4659,7 @@ int multiSlsDetector::printReceiverConfiguration(){
 
 	std::cout << "Printing Receiver configurations for all detectors..." << std::endl;
 
-	for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			std::cout << std::endl << "#Detector " << i << ":" << std::endl;
 
@@ -4683,7 +4683,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
 
   int nd=thisMultiDetector->numberOfDetectors;
   
-  for (int i=0; i<nd; i++) {
+  for (int i=0; i<nd; ++i) {
     //    sprintf(ext,".det%d",i);
     if (detectors[i]) {
       detectors[i]->freeSharedMemory();
@@ -4718,7 +4718,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
       sargname="none";
       sargval="0";
       getline(infile,str);
-      iline++;
+      ++iline;
 #ifdef VERBOSE
       std::cout<<  str << std::endl;
 #endif
@@ -4750,7 +4750,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
 	  std::cout<< "--" << iargval << " " << args[iargval]  << std::endl;
 #endif
 
-	  iargval++;
+	  ++iargval;
 	  //}
 	}
 
@@ -4762,7 +4762,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
 	cmd=new multiSlsDetectorClient(iargval, args, PUT_ACTION, this);
 	delete cmd;
       }
-      iline++;
+      ++iline;
     }
 
 
@@ -4827,7 +4827,7 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
   
   int iv=0;
   char *args[100];
-  for (int ia=0; ia<100; ia++) {
+  for (int ia=0; ia<100; ++ia) {
     args[ia]=new char[1000];
   }
   int ret=OK;
@@ -4848,9 +4848,9 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
     cout << iv << " " << names[iv] << endl;
     strcpy(args[0],names[iv].c_str());
     outfile << names[iv] << " " << cmd->executeLine(1,args,GET_ACTION) << std::endl;
-    iline++;
+    ++iline;
     // single detector configuration
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       //    sprintf(ext,".det%d",i);
       if (detectors[i]) {
 	iv+=detectors[i]->writeConfigurationFile(outfile,i);
@@ -4861,12 +4861,12 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
   
 
     //other configurations
-    for (iv=1; iv<nvar; iv++) {
+    for (iv=1; iv<nvar; ++iv) {
       
       cout << iv << " " << names[iv] << endl;
       strcpy(args[0],names[iv].c_str());
       outfile << names[iv] << " " << cmd->executeLine(1,args,GET_ACTION) << std::endl;
-      iline++;
+      ++iline;
     }
     
     
@@ -4881,7 +4881,7 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
     ret = FAIL;
   }
 
-  for (int ia=0; ia<100; ia++) {
+  for (int ia=0; ia<100; ++ia) {
     delete [] args[ia];
   }
   
@@ -4925,7 +4925,7 @@ int multiSlsDetector::writeDataFile(string fname, double *data, double *err, dou
   if (outfile.is_open())
     {
     
-      for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+      for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
      
 	if (detectors[i]) {
 	  n=detectors[i]->getTotalNumberOfChannels();
@@ -4978,7 +4978,7 @@ int multiSlsDetector::writeDataFile(string fname, int *data) {
   outfile.open (fname.c_str(),ios_base::out);
   if (outfile.is_open())
     {
-      for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+      for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 	if (detectors[i]) {
 #ifdef VERBOSE
 	  cout << " write " << i << " position " << off << " offset " << choff << endl;
@@ -5020,7 +5020,7 @@ int multiSlsDetector::readDataFile(string fname, double *data, double *err, doub
   infile.open(fname.c_str(), ios_base::in);
   if (infile.is_open()) {
 
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       if (detectors[i]) {
 	iline+=detectors[i]->readDataFile(detectors[i]->getTotalNumberOfChannels(), infile, data+off, pe, pa, dataformat, choff);
 	if(detectors[i]->getErrorMask())
@@ -5062,7 +5062,7 @@ int multiSlsDetector::readDataFile(string fname, int *data) {
   infile.open(fname.c_str(), ios_base::in);
   if (infile.is_open()) {
 
-    for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+    for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
       if (detectors[i]) {
 	iline+=detectors[i]->readDataFile(infile, data+off,detectors[i]->getTotalNumberOfChannels(), choff);
 	if(detectors[i]->getErrorMask())
@@ -5096,7 +5096,7 @@ int multiSlsDetector::setReceiverOnline(int off) {
 		}else{
 			//return storage values
 			int* iret[thisMultiDetector->numberOfDetectors];
-			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 				if(detectors[idet]){
 					iret[idet]= new int(-1);
 					Task* task = new Task(new func1_t<int,int>(&slsDetector::setReceiverOnline,
@@ -5106,7 +5106,7 @@ int multiSlsDetector::setReceiverOnline(int off) {
 			}
 			threadpool->startExecuting();
 			threadpool->wait_for_tasks_to_complete();
-			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+			for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 				if(detectors[idet]){
 					if(iret[idet] != NULL){
 						if (ret==-100)
@@ -5129,7 +5129,7 @@ int multiSlsDetector::setReceiverOnline(int off) {
 
 string multiSlsDetector::checkReceiverOnline() {
   string retval1 = "",retval;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       retval=detectors[idet]->checkReceiverOnline();
       if(!retval.empty()){
@@ -5150,7 +5150,7 @@ string multiSlsDetector::setFilePath(string s) {
 	//if the sls file paths are different, it should be realized by always using setfilepath even if string empty
 	//if(!s.empty()){
 
-		for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+		for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 			if (detectors[idet]) {
 				ret1=detectors[idet]->setFilePath(s);
 			      if(detectors[idet]->getErrorMask())
@@ -5189,7 +5189,7 @@ string multiSlsDetector::setFileName(string s) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<posmax; idet++){
+		for(int idet=0; idet<posmax; ++idet){
 			if(detectors[idet]){
 				if(sret[idet]!= NULL) {
 					if(ret == "error")
@@ -5212,7 +5212,7 @@ string multiSlsDetector::setFileName(string s) {
 slsReceiverDefs::fileFormat multiSlsDetector::setFileFormat(fileFormat f) {
 	int ret=-100, ret1;
 
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret1=(int)detectors[idet]->setFileFormat(f);
 			if(detectors[idet]->getErrorMask())
@@ -5238,7 +5238,7 @@ int multiSlsDetector::setFileIndex(int i) {
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func1_t<int,int>(&slsDetector::setFileIndex,
@@ -5248,7 +5248,7 @@ int multiSlsDetector::setFileIndex(int i) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -5278,7 +5278,7 @@ int multiSlsDetector::startReceiver(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::startReceiver,
@@ -5288,7 +5288,7 @@ int multiSlsDetector::startReceiver(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -5340,7 +5340,7 @@ int multiSlsDetector::stopReceiver(){
 		return FAIL;
 	}else{
 		int* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::stopReceiver,
@@ -5350,7 +5350,7 @@ int multiSlsDetector::stopReceiver(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -5379,7 +5379,7 @@ slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){
 
 		}
 	}
-	for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
+	for (i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			s=detectors[i]->startReceiverReadout();
 			if(detectors[i]->getErrorMask())
@@ -5417,7 +5417,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
 		return ERROR;
 	}else{
 		runStatus* iret[posmax-posmin];
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				iret[idet]= new runStatus(ERROR);
 				Task* task = new Task(new func0_t<runStatus>(&slsDetector::getReceiverStatus,
@@ -5427,7 +5427,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=posmin; idet<posmax; idet++){
+		for(int idet=posmin; idet<posmax; ++idet){
 			if((idet!=thisMultiDetector->masterPosition) && (detectors[idet])){
 				if(iret[idet] != NULL){
 					if(*iret[idet] == (int)ERROR)
@@ -5461,7 +5461,7 @@ int multiSlsDetector::getFramesCaughtByAnyReceiver() {
 		}
 	}
 
-	for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
+	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i)
 		if (detectors[i]){
 			ret=detectors[i]->getFramesCaughtByReceiver();
 			if(detectors[i]->getErrorMask())
@@ -5483,7 +5483,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() {
 		return -1;
 	}else{
 		int* iret[posmax];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(0);
 				Task* task = new Task(new func0_t<int>(&slsDetector::getFramesCaughtByReceiver,
@@ -5494,7 +5494,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() {
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
 
-		for(int idet=0; idet<posmax; idet++){
+		for(int idet=0; idet<posmax; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if(*iret[idet] == -1)	// could not connect
@@ -5519,7 +5519,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() {
 
 int multiSlsDetector::getReceiverCurrentFrameIndex() {
   int ret=0,ret1=0;
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
+  for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i)
     if (detectors[i]){
       ret1+=detectors[i]->getReceiverCurrentFrameIndex();
       if(detectors[i]->getErrorMask())
@@ -5544,7 +5544,7 @@ int multiSlsDetector::resetFramesCaught() {
 		return FAIL;
 	}else{
 		int* iret[posmax];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(OK);
 				Task* task = new Task(new func0_t<int>(&slsDetector::resetFramesCaught,
@@ -5555,7 +5555,7 @@ int multiSlsDetector::resetFramesCaught() {
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
 
-		for(int idet=0; idet<posmax; idet++){
+		for(int idet=0; idet<posmax; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if(*iret[idet] != OK)
@@ -5749,7 +5749,7 @@ void multiSlsDetector::readFrameFromReceiver(){
 				//get individual images
 				if(FAIL == getData(isocket, jungfrau, image, expectedslssize, currentAcquisitionIndex,currentFrameIndex,currentSubFrameIndex,currentFileName)){
 					runningList[isocket] = false;
-					numRunning--;
+					--numRunning;
 					continue;
 				}
 
@@ -5826,7 +5826,7 @@ int multiSlsDetector::lockReceiver(int lock) {
 
   int ret=-100, ret1;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       ret1=detectors[idet]->lockReceiver(lock);
       if(detectors[idet]->getErrorMask())
@@ -5849,7 +5849,7 @@ int multiSlsDetector::lockReceiver(int lock) {
 string multiSlsDetector::getReceiverLastClientIP() {
   string s0="", s1="",s ;
 
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       s=detectors[idet]->getReceiverLastClientIP();
       if(detectors[idet]->getErrorMask())
@@ -5877,7 +5877,7 @@ string multiSlsDetector::getReceiverLastClientIP() {
 int multiSlsDetector::exitReceiver() {
 
   int ival=FAIL, iv;
-  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
     if (detectors[idet]) {
       iv=detectors[idet]->exitReceiver();
       if (iv==OK)
@@ -5892,7 +5892,7 @@ int multiSlsDetector::exitReceiver() {
 int multiSlsDetector::enableWriteToFile(int enable){
 	int ret=-100, ret1;
 
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret1=detectors[idet]->enableWriteToFile(enable);
 			if(detectors[idet]->getErrorMask())
@@ -5912,7 +5912,7 @@ int multiSlsDetector::enableWriteToFile(int enable){
 int multiSlsDetector::overwriteFile(int enable){
 	int ret=-100, ret1;
 
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret1=detectors[idet]->overwriteFile(enable);
 			if(detectors[idet]->getErrorMask())
@@ -5938,7 +5938,7 @@ int multiSlsDetector::setFrameIndex(int index){
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<posmax; idet++){
+		for(int idet=0; idet<posmax; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func1_t<int,int>(&slsDetector::setFrameIndex,
@@ -5948,7 +5948,7 @@ int multiSlsDetector::setFrameIndex(int index){
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -5980,7 +5980,7 @@ string multiSlsDetector::getErrorMessage(int &critical){
 		 if(multiMask & MULTI_DETECTORS_NOT_ADDED)
 			 retval.append("Detectors not added:\n"+string(getNotAddedList())+string("\n"));
 
-		  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+		  for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		    if (detectors[idet]) {
 		    	//if the detector has error
 		    	if(multiMask&(1<<idet)){
@@ -6011,7 +6011,7 @@ string multiSlsDetector::getErrorMessage(int &critical){
 int64_t multiSlsDetector::clearAllErrorMask(){
 	clearErrorMask();
 	clearNotAddedList();
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet])
 			detectors[idet]->clearErrorMask();
 
@@ -6023,7 +6023,7 @@ int64_t multiSlsDetector::clearAllErrorMask(){
 int multiSlsDetector::calibratePedestal(int frames){
 	int ret=-100, ret1;
 
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret1=detectors[idet]->calibratePedestal(frames);
 			if(detectors[idet]->getErrorMask())
@@ -6044,7 +6044,7 @@ int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver, int freq){
 	if(!getFromReceiver)
 		return thisMultiDetector->receiver_read_freq;
 
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret1=detectors[idet]->setReadReceiverFrequency(getFromReceiver,freq);
 			if(detectors[idet]->getErrorMask())
@@ -6066,7 +6066,7 @@ int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver, int freq){
 int multiSlsDetector::setReceiverReadTimer(int time_in_ms){
 	int ret=-100, ret1;
 
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
 		if (detectors[idet]) {
 			ret1=detectors[idet]->setReceiverReadTimer(time_in_ms);
 			if(detectors[idet]->getErrorMask())
@@ -6116,7 +6116,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){//cannot parra
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func1_t<int,int>(&slsDetector::enableDataStreamingFromReceiver,
@@ -6126,7 +6126,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){//cannot parra
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -6150,7 +6150,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){//cannot parra
 
 int multiSlsDetector::enableReceiverCompression(int i){
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 			ret1=detectors[idet]->enableReceiverCompression(i);
 		    if(detectors[idet]->getErrorMask())
@@ -6167,7 +6167,7 @@ int multiSlsDetector::enableReceiverCompression(int i){
 
 int multiSlsDetector::enableTenGigabitEthernet(int i){
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 			ret1=detectors[idet]->enableTenGigabitEthernet(i);
 		    if(detectors[idet]->getErrorMask())
@@ -6184,7 +6184,7 @@ int multiSlsDetector::enableTenGigabitEthernet(int i){
 
 int multiSlsDetector::setReceiverFifoDepth(int i){
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 			ret1=detectors[idet]->setReceiverFifoDepth(i);
 		    if(detectors[idet]->getErrorMask())
@@ -6215,12 +6215,12 @@ int multiSlsDetector::setCTBPattern(string fname) {
      FILE *fd=fopen(fname.c_str(),"r");
      if (fd>0) {
        while (fread(&word, sizeof(word), 1,fd)) {
-	 for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	 for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 	   if (detectors[idet]){
 	     detectors[idet]->setCTBWord(addr,word);
 	   }
 	// cout << hex << addr << " " << word << dec << endl;
-	 addr++;
+	 ++addr;
        }
        
        fclose(fd);
@@ -6243,7 +6243,7 @@ int multiSlsDetector::setCTBPattern(string fname) {
   */
 uint64_t multiSlsDetector::setCTBWord(int addr,uint64_t word) {
 	uint64_t ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 		  ret1=detectors[idet]->setCTBWord(addr, word);
 		    if(detectors[idet]->getErrorMask())
@@ -6270,7 +6270,7 @@ int multiSlsDetector::setCTBPatLoops(int level,int &start, int &stop, int &n) {
 
 
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 		  ret1=detectors[idet]->setCTBPatLoops(level, start, stop, n);
 		    if(detectors[idet]->getErrorMask())
@@ -6296,7 +6296,7 @@ int multiSlsDetector::setCTBPatWaitAddr(int level, int addr) {
   
 
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 		  ret1=detectors[idet]->setCTBPatWaitAddr(level, addr);
 		    if(detectors[idet]->getErrorMask())
@@ -6321,7 +6321,7 @@ int multiSlsDetector::setCTBPatWaitTime(int level, uint64_t t) {
 
 
 	int ret=-100,ret1;
-	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)
+	for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
 		if (detectors[idet]){
 		  ret1=detectors[idet]->setCTBPatWaitTime(level,t);
 		    if(detectors[idet]->getErrorMask())
@@ -6345,7 +6345,7 @@ int multiSlsDetector::pulsePixel(int n,int x,int y) {
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func3_t<int,int,int,int>(&slsDetector::pulsePixel,
@@ -6355,7 +6355,7 @@ int multiSlsDetector::pulsePixel(int n,int x,int y) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -6382,7 +6382,7 @@ int multiSlsDetector::pulsePixelNMove(int n,int x,int y) {
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func3_t<int,int,int,int>(&slsDetector::pulsePixelNMove,
@@ -6392,7 +6392,7 @@ int multiSlsDetector::pulsePixelNMove(int n,int x,int y) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -6419,7 +6419,7 @@ int multiSlsDetector::pulseChip(int n) {
 	}else{
 		//return storage values
 		int* iret[thisMultiDetector->numberOfDetectors];
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				iret[idet]= new int(-1);
 				Task* task = new Task(new func1_t<int,int>(&slsDetector::pulseChip,
@@ -6429,7 +6429,7 @@ int multiSlsDetector::pulseChip(int n) {
 		}
 		threadpool->startExecuting();
 		threadpool->wait_for_tasks_to_complete();
-		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+		for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 			if(detectors[idet]){
 				if(iret[idet] != NULL){
 					if (ret==-100)
@@ -6450,7 +6450,7 @@ int multiSlsDetector::pulseChip(int n) {
 
 void multiSlsDetector::setAcquiringFlag(bool b){
 	thisMultiDetector->acquiringFlag = b;
-	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++){
+	for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
 		if(detectors[idet]){
 			detectors[idet]->setAcquiringFlag(b);
 		}
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 8038bc09d..6951892e9 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -190,9 +190,9 @@ slsDetector::slsDetector(int pos, int id, multiSlsDetector *p) :slsDetectorUtils
     if it fails the detector id is incremented until it succeeds
     */
     shmId=initSharedMemory(type,id);
-    id++;
+    ++id;
   }
-  id--;
+  --id;
 #ifdef VERBOSE
   std::cout<< "Detector id is " << id << std::endl;
 #endif
@@ -238,9 +238,9 @@ slsDetector::slsDetector(int pos, detectorType type, int id, multiSlsDetector *p
     if it fails the detector id is incremented until it succeeds
     */
     shmId=initSharedMemory(type,id);
-    id++;
+    ++id;
   }
-  id--;
+  --id;
 #ifdef VERBOSE
   std::cout<< "Detector id is " << id << " type is " << type << std::endl;
 #endif
@@ -304,9 +304,9 @@ slsDetector::slsDetector(int pos, char *name, int id, int cport,multiSlsDetector
     if it fails the detector id is incremented until it succeeds
     */
     shmId=initSharedMemory(type,id);
-    id++;
+    ++id;
   }
-  id--;
+  --id;
 #ifdef VERBOSE
   std::cout<< "Detector id is " << id << std::endl;
 #endif
@@ -779,13 +779,13 @@ int slsDetector::initializeDetectorSize(detectorType type) {
     thisDetector->flippedData[1] = 0;
     thisDetector->zmqport = 0;
 
-    for (int ia=0; ia<MAX_ACTIONS; ia++) {
+    for (int ia=0; ia<MAX_ACTIONS; ++ia) {
       strcpy(thisDetector->actionScript[ia],"none");
       strcpy(thisDetector->actionParameter[ia],"none");
     }
 
 
-    for (int iscan=0; iscan<MAX_SCAN_LEVELS; iscan++) {
+    for (int iscan=0; iscan<MAX_SCAN_LEVELS; ++iscan) {
 
       thisDetector->scanMode[iscan]=0;
       strcpy(thisDetector->scanScript[iscan],"none");
@@ -830,7 +830,7 @@ int slsDetector::initializeDetectorSize(detectorType type) {
   fferrors=(double*)(goff+thisDetector->fferroff);
   detectorModules=(sls_detector_module*)(goff+ thisDetector->modoff);
 #ifdef VERBOSE
-  //   for (int imod=0; imod< thisDetector->nModsMax; imod++)
+  //   for (int imod=0; imod< thisDetector->nModsMax; ++imod)
   //  std::cout<< hex << detectorModules+imod << dec <<std::endl;
 #endif
 
@@ -945,7 +945,7 @@ int slsDetector::initializeDetectorStructure() {
   //p2=(char*)thisDetector;
 
   /** for each of the detector modules up to the maximum number which can be installed initlialize the sls_detector_module structure \sa ::sls_detector_module*/
-  for (int imod=0; imod<thisDetector->nModsMax; imod++) {
+  for (int imod=0; imod<thisDetector->nModsMax; ++imod) {
 
 
 
@@ -964,37 +964,37 @@ int slsDetector::initializeDetectorStructure() {
     thisMod->reg=0;
 
     /** initializes the dacs values to 0 */
-    for (int idac=0; idac<thisDetector->nDacs; idac++) {
+    for (int idac=0; idac<thisDetector->nDacs; ++idac) {
       *(dacs+idac+thisDetector->nDacs*imod)=0;
     }
 
 
     /** initializes the adc values to 0 */
-    for (int iadc=0; iadc<thisDetector->nAdcs; iadc++) {
+    for (int iadc=0; iadc<thisDetector->nAdcs; ++iadc) {
       *(adcs+iadc+thisDetector->nAdcs*imod)=0;
     }
 
 
 
     /** initializes the chip registers to 0 */
-    for (int ichip=0; ichip<thisDetector->nChips; ichip++) {
+    for (int ichip=0; ichip<thisDetector->nChips; ++ichip) {
       *(chipregs+ichip+thisDetector->nChips*imod)=-1;
     }
 
 
     /** initializes the channel registers to 0 */
-    for (int ichan=0; ichan<thisDetector->nChans*thisDetector->nChips; ichan++) {
+    for (int ichan=0; ichan<thisDetector->nChans*thisDetector->nChips; ++ichan) {
       *(chanregs+ichan+thisDetector->nChips*thisDetector->nChans*imod)=-1;
     }
 
     /** initializes the gain values to 0 */
-    for (int igain=0; igain<thisDetector->nGain; igain++) {
+    for (int igain=0; igain<thisDetector->nGain; ++igain) {
       *(gain+igain+thisDetector->nGain*imod)=0;
     }
 
 
     /** initializes the offset values to 0 */
-    for (int ioffset=0; ioffset<thisDetector->nOffset; ioffset++) {
+    for (int ioffset=0; ioffset<thisDetector->nOffset; ++ioffset) {
       *(offset+ioffset+thisDetector->nOffset*imod)=0;
     }
 
@@ -1730,7 +1730,7 @@ int slsDetector::getTotalNumberOfChannels() {
     if (thisDetector->nChan[X]>=32) {
       if (thisDetector->nROI>0) {
 	thisDetector->nChan[X]-=32;
-	for (int iroi=0; iroi<thisDetector->nROI; iroi++)
+	for (int iroi=0; iroi<thisDetector->nROI; ++iroi)
 	  thisDetector->nChan[X]+=thisDetector->roiLimits[iroi].xmax-thisDetector->roiLimits[iroi].xmin+1;
       }
     }
@@ -2489,7 +2489,7 @@ dacs_t slsDetector::setDAC(dacs_t val, dacIndex index, int mV, int imod){
 	      *(dacs+index+imod*thisDetector->nDacs)=retval[0];
 	    }
 	    else {
-	      for (imod=0; imod<thisDetector->nModsMax; imod++)
+	      for (imod=0; imod<thisDetector->nModsMax; ++imod)
 		*(dacs+index+imod*thisDetector->nDacs)=retval[0];
 	    }
 	  }
@@ -2601,9 +2601,9 @@ int slsDetector::setChannel(int64_t reg, int ichan, int ichip, int imod){
       chamax=thisDetector->nChans;
       }*/
 
-  // for (int im=mmin; im<mmax; im++) {
-  //  for (int ichi=chimin; ichi<chimax; ichi++) {
-  //    for (int icha=chamin; icha<chamax; icha++) {
+  // for (int im=mmin; im<mmax; ++im) {
+  //  for (int ichi=chimin; ichi<chimax; ++ichi) {
+  //    for (int icha=chamin; icha<chamax; ++icha) {
   myChan.chan=ichan;//icha;
   myChan.chip=ichip;//ichi;
   myChan.module=imod;//im;
@@ -2671,9 +2671,9 @@ int slsDetector::setChannel(sls_detector_channel chan){
 
 
 
-      for (int im=mmin; im<mmax; im++) {
-	for (int ichi=chimin; ichi<chimax; ichi++) {
-	  for (int icha=chamin; icha<chamax; icha++) {
+      for (int im=mmin; im<mmax; ++im) {
+	for (int ichi=chimin; ichi<chimax; ++ichi) {
+	  for (int icha=chamin; icha<chamax; ++icha) {
 
 	    *(chanregs+im*thisDetector->nChans*thisDetector->nChips+ichi*thisDetector->nChips+icha)=retval;
 
@@ -2779,14 +2779,14 @@ int slsDetector::setChip(int reg, int ichip, int imod){
 
   myChip.nchan=thisDetector->nChans;
   myChip.reg=reg;
-  for (int im=mmin; im<mmax; im++) {
-    for (int ichi=chimin; ichi<chimax; ichi++) {
+  for (int im=mmin; im<mmax; ++im) {
+    for (int ichi=chimin; ichi<chimax; ++ichi) {
       myChip.chip=ichi;
       myChip.module=im;
       if (chanregs)
 	myChip.chanregs=(chanregs+ichi*thisDetector->nChans+im*thisDetector->nChans*thisDetector->nChips);
       else {
-	for (int i=0; i<thisDetector->nChans; i++)
+	for (int i=0; i<thisDetector->nChans; ++i)
 	  chregs[i]=-1;
 	myChip.chanregs=chregs;
       }
@@ -2885,7 +2885,7 @@ slsDetectorDefs::sls_detector_chip slsDetector::getChip(int ichip, int imod){
     if (chipregs)
       *(chipregs+ichip+imod*thisDetector->nChips)=myChip.reg;
     if (chanregs) {
-      for (int ichan=0; ichan<thisDetector->nChans; ichan++)
+      for (int ichan=0; ichan<thisDetector->nChans; ++ichan)
 	*(chanregs+imod*thisDetector->nChans*thisDetector->nChips+ichip*thisDetector->nChans+ichan)=*((myChip.chanregs)+ichan);
     }
   }
@@ -2923,7 +2923,7 @@ int slsDetector::setModule(int reg, int imod){
 
 
 
-  for (int im=mmin; im<mmax; im++) {
+  for (int im=mmin; im<mmax; ++im) {
 
     myModule.module=im;
     myModule.nchan=thisDetector->nChans;
@@ -2943,34 +2943,34 @@ int slsDetector::setModule(int reg, int imod){
     }
 
 
-    for (int i=0; i<thisDetector->nAdcs; i++)
+    for (int i=0; i<thisDetector->nAdcs; ++i)
       ads[i]=-1;
 
     if (chanregs)
       myModule.chanregs=chanregs+im*thisDetector->nChips*thisDetector->nChans;
     else {
-      for (int i=0; i<thisDetector->nChans*thisDetector->nChips; i++)
+      for (int i=0; i<thisDetector->nChans*thisDetector->nChips; ++i)
 	charegs[i]=-1;
       myModule.chanregs=charegs;
     }
     if (chipregs)
       myModule.chipregs=chanregs+im*thisDetector->nChips;
     else {
-      for (int ichip=0; ichip<thisDetector->nChips; ichip++)
+      for (int ichip=0; ichip<thisDetector->nChips; ++ichip)
 	chiregs[ichip]=-1;
       myModule.chipregs=chiregs;
     }
     if (dacs)
       myModule.dacs=dacs+im*thisDetector->nDacs;
     else {
-      for (int i=0; i<thisDetector->nDacs; i++)
+      for (int i=0; i<thisDetector->nDacs; ++i)
 	das[i]=-1;
       myModule.dacs=das;
     }
     if (adcs)
       myModule.adcs=adcs+im*thisDetector->nAdcs;
     else {
-      for (int i=0; i<thisDetector->nAdcs; i++)
+      for (int i=0; i<thisDetector->nAdcs; ++i)
 	ads[i]=-1;
       myModule.adcs=ads;
     }
@@ -3051,25 +3051,25 @@ int slsDetector::setModule(sls_detector_module module, int iodelay, int tau, int
 
 				if(thisDetector->myDetectorType != JUNGFRAU){
 					if(tb) {
-						for (int ichip=0; ichip<thisDetector->nChips; ichip++) {
+						for (int ichip=0; ichip<thisDetector->nChips; ++ichip) {
 							if (chipregs)
 								chipregs[ichip+thisDetector->nChips*imod]=module.chipregs[ichip];
 
 							if (chanregs) {
-								for (int i=0; i<thisDetector->nChans; i++) {
+								for (int i=0; i<thisDetector->nChans; ++i) {
 									chanregs[i+ichip*thisDetector->nChans+thisDetector->nChips*thisDetector->nChans*imod]=module.chanregs[ichip*thisDetector->nChans+i];
 								}
 							}
 						}
 					}
 					if (adcs) {
-						for (int i=0; i<thisDetector->nAdcs; i++)
+						for (int i=0; i<thisDetector->nAdcs; ++i)
 							adcs[i+imod*thisDetector->nAdcs]=module.adcs[i];
 					}
 				}
 
 				if (dacs) {
-					for (int i=0; i<thisDetector->nDacs; i++)
+					for (int i=0; i<thisDetector->nDacs; ++i)
 						dacs[i+imod*thisDetector->nDacs]=module.dacs[i];
 				}
 
@@ -3081,12 +3081,12 @@ int slsDetector::setModule(sls_detector_module module, int iodelay, int tau, int
 		}
 
 		if ((thisDetector->nGain) && (gainval) && (gain)) {
-			for (int i=0; i<thisDetector->nGain; i++)
+			for (int i=0; i<thisDetector->nGain; ++i)
 				gain[i+imod*thisDetector->nGain]=gainval[i];
 		}
 
 		if ((thisDetector->nOffset) && (offsetval) && (offset))  {
-			for (int i=0; i<thisDetector->nOffset; i++)
+			for (int i=0; i<thisDetector->nOffset; ++i)
 				offset[i+imod*thisDetector->nOffset]=offsetval[i];
 		}
 
@@ -3181,25 +3181,25 @@ slsDetectorDefs::sls_detector_module  *slsDetector::getModule(int imod){
 				thisDetector->nAdcs=myMod->nadc;
 
 				if(thisDetector->myDetectorType != JUNGFRAU){
-					for (int ichip=0; ichip<thisDetector->nChips; ichip++) {
+					for (int ichip=0; ichip<thisDetector->nChips; ++ichip) {
 						if (chipregs)
 							chipregs[ichip+thisDetector->nChips*imod]=myMod->chipregs[ichip];
 
 						if (chanregs) {
-							for (int i=0; i<thisDetector->nChans; i++) {
+							for (int i=0; i<thisDetector->nChans; ++i) {
 								chanregs[i+ichip*thisDetector->nChans+thisDetector->nChips*thisDetector->nChans*imod]=myMod->chanregs[ichip*thisDetector->nChans+i];
 							}
 						}
 					}
 
 					if (adcs) {
-						for (int i=0; i<thisDetector->nAdcs; i++)
+						for (int i=0; i<thisDetector->nAdcs; ++i)
 							adcs[i+imod*thisDetector->nAdcs]=myMod->adcs[i];
 					}
 				}
 
 				if (dacs) {
-					for (int i=0; i<thisDetector->nDacs; i++)
+					for (int i=0; i<thisDetector->nDacs; ++i)
 						dacs[i+imod*thisDetector->nDacs]=myMod->dacs[i];
 				}
 				(detectorModules+imod)->gain=myMod->gain;
@@ -3210,12 +3210,12 @@ slsDetectorDefs::sls_detector_module  *slsDetector::getModule(int imod){
 		}
 
 		if ((thisDetector->nGain) && (gainval) && (gain)) {
-			for (int i=0; i<thisDetector->nGain; i++)
+			for (int i=0; i<thisDetector->nGain; ++i)
 				gain[i+imod*thisDetector->nGain]=gainval[i];
 		}
 
 		if ((thisDetector->nOffset) && (offsetval) && (offset))  {
-			for (int i=0; i<thisDetector->nOffset; i++)
+			for (int i=0; i<thisDetector->nOffset; ++i)
 				offset[i+imod*thisDetector->nOffset]=offsetval[i];
 		}
 
@@ -3678,7 +3678,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
 			modma=thisDetector->nMod[X]*thisDetector->nMod[Y];
 		}
 
-		for (im=modmi; im<modma; im++) {
+		for (im=modmi; im<modma; ++im) {
 			ostringstream ostfn, oscfn;
 			myMod->module=im;
 
@@ -3819,12 +3819,12 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
 int slsDetector::getChanRegs(double* retval,bool fromDetector){
   int n=getTotalNumberOfChannels();
   if(fromDetector){
-    for(int im=0;im<setNumberOfModules();im++)
+    for(int im=0;im<setNumberOfModules();++im)
       getModule(im);
   }
   //the original array has 0 initialized
   if(chanregs){
-    for (int i=0; i<n; i++)
+    for (int i=0; i<n; ++i)
       retval[i] = (double) (chanregs[i] & TRIMBITMASK);
   }
   return n;
@@ -4231,7 +4231,7 @@ int* slsDetector::getDataFromDetector(int *retval){
 			}
 			return NULL;
 		}
-		// for (int ib=0; ib<thisDetector->dataBytes/8; ib++)
+		// for (int ib=0; ib<thisDetector->dataBytes/8; ++ib)
 		//   cout << ((*(((u_int64_t*)retval)+ib))>>17&1) ;
 
 
@@ -4262,7 +4262,7 @@ int* slsDetector::readAll(){
 
       while ((retval=getDataFromDetector())){
 #ifdef VERBOSE
-	i++;
+	++i;
 	std::cout<< i << std::endl;
 #endif
 	dataQueue.push(retval);
@@ -4324,7 +4324,7 @@ int* slsDetector::startAndReadAll(){
   //#endif
   while ((retval=getDataFromDetector())){
 #ifdef VERBOSE
-    i++;
+    ++i;
     std::cout<< i << std::endl;
     //#else
     //std::cout<< "-" << flush;
@@ -4342,7 +4342,7 @@ int* slsDetector::startAndReadAll(){
 #endif
   return dataQueue.front(); // check what we return!
   /* while ((retval=getDataFromDetectorNoWait()))
-     i++;
+     ++i;
      #ifdef VERBOSE
      std::cout<< "Received " << i << " frames"<< std::endl;
      #endif
@@ -5112,10 +5112,10 @@ int slsDetector::setROI(int n,ROI roiLimits[]){
 	//sort ascending order
 	int temp;
 
-	for(int i=0;i<n;i++){
+	for(int i=0;i<n;++i){
 	  
 	  //	  cout << "*** ROI "<< i << " xmin " << roiLimits[i].xmin << " xmax "<< roiLimits[i].xmax << endl;
-		for(int j=i+1;j<n;j++){
+		for(int j=i+1;j<n;++j){
 			if(roiLimits[j].xmin<roiLimits[i].xmin){
 	
 			  temp=roiLimits[i].xmin;roiLimits[i].xmin=roiLimits[j].xmin;roiLimits[j].xmin=temp;
@@ -5194,13 +5194,13 @@ int slsDetector::sendROI(int n,ROI roiLimits[]){
 
   //update client
   if(ret!=FAIL){
-    for(int i=0;i<retvalsize;i++)
+    for(int i=0;i<retvalsize;++i)
       thisDetector->roiLimits[i]=retval[i];
     thisDetector->nROI = retvalsize;
   }
 
   //#ifdef VERBOSE
-  for(int j=0;j<thisDetector->nROI;j++)
+  for(int j=0;j<thisDetector->nROI;++j)
     cout<<"get"<< roiLimits[j].xmin<<"\t"<<roiLimits[j].xmax<<"\t"<<roiLimits[j].ymin<<"\t"<<roiLimits[j].ymax<<endl;
   //#endif
 
@@ -5359,7 +5359,7 @@ double* slsDetector::decodeData(int *datain, int &nn, double *fdata) {
   if (thisDetector->timerValue[PROBES_NUMBER]==0) {
     if (thisDetector->myDetectorType==JUNGFRAUCTB) {
       
-      for (ichan=0; ichan<nn; ichan++) {
+      for (ichan=0; ichan<nn; ++ichan) {
 	//   //	}
 	dataout[ichan]=*((u_int16_t*)ptr);
 	ptr+=2;
@@ -5369,38 +5369,38 @@ double* slsDetector::decodeData(int *datain, int &nn, double *fdata) {
     } else {
 			switch (nbits) {
 			case 1:
-				for (ibyte=0; ibyte<thisDetector->dataBytes; ibyte++) {
+				for (ibyte=0; ibyte<thisDetector->dataBytes; ++ibyte) {
 				  iptr=ptr[ibyte];//&0x1;
-					for (ipos=0; ipos<8; ipos++) {
+					for (ipos=0; ipos<8; ++ipos) {
 						//	dataout[ibyte*2+ichan]=((iptr&((0xf)<<ichan))>>ichan)&0xf;
 						ival=(iptr>>(ipos))&0x1;
 						dataout[ichan]=ival;
-						ichan++;
+						++ichan;
 					}
 				}
 				break;
 			case 4:
-				for (ibyte=0; ibyte<thisDetector->dataBytes; ibyte++) {
+				for (ibyte=0; ibyte<thisDetector->dataBytes; ++ibyte) {
 					iptr=ptr[ibyte];
-					for (ipos=0; ipos<2; ipos++) {
+					for (ipos=0; ipos<2; ++ipos) {
 						//	dataout[ibyte*2+ichan]=((iptr&((0xf)<<ichan))>>ichan)&0xf;
 						ival=(iptr>>(ipos*4))&0xf;
 						dataout[ichan]=ival;
-						ichan++;
+						++ichan;
 					}
 				}
 				break;
 			case 8:
-				for (ichan=0; ichan<thisDetector->dataBytes; ichan++) {
+				for (ichan=0; ichan<thisDetector->dataBytes; ++ichan) {
 					ival=ptr[ichan]&0xff;
 					dataout[ichan]=ival;
 				}
 				break;
 			case 16:
-				for (ichan=0; ichan<nch; ichan++) {
+				for (ichan=0; ichan<nch; ++ichan) {
 					// dataout[ichan]=0;
 					// ival=0;
-					// for (ibyte=0; ibyte<2; ibyte++) {
+					// for (ibyte=0; ibyte<2; ++ibyte) {
 					// 	iptr=ptr[ichan*2+ibyte];
 					// 	ival|=((iptr<<(ibyte*bytesize))&(0xff<<(ibyte*bytesize)));
 					// }
@@ -5411,13 +5411,13 @@ double* slsDetector::decodeData(int *datain, int &nn, double *fdata) {
 			default:
 			  int mask=0xffffffff;
 			  if(thisDetector->myDetectorType == MYTHEN) mask=0xffffff;
-			  for (ichan=0; ichan<nch; ichan++) {
+			  for (ichan=0; ichan<nch; ++ichan) {
 			    dataout[ichan]=datain[ichan]&mask;
 			  }
 			}
     }
   } else {
-    for (ichan=0; ichan<nch; ichan++) {
+    for (ichan=0; ichan<nch; ++ichan) {
       dataout[ichan]=datain[ichan];
     }
   }
@@ -5478,7 +5478,7 @@ int slsDetector::setFlatFieldCorrection(string fname)
       int nm=getNMods();
       int chpm[nm];
       int mMask[nm];
-      for (int i=0; i<nm; i++) {
+      for (int i=0; i<nm; ++i) {
 	chpm[im]=getChansPerMod(im);
 	mMask[im]=im;
       }
@@ -5505,7 +5505,7 @@ int slsDetector::setFlatFieldCorrection(string fname)
 
 int slsDetector::fillModuleMask(int *mM){
   if (mM)
-    for (int i=0; i<getNMods(); i++)
+    for (int i=0; i<getNMods(); ++i)
       mM[i]=i;
 
   return getNMods();
@@ -5514,7 +5514,7 @@ int slsDetector::fillModuleMask(int *mM){
 
 int slsDetector::setFlatFieldCorrection(double *corr, double *ecorr) {
   if (corr!=NULL) {
-    for (int ichan=0; ichan<thisDetector->nMod[Y]*thisDetector->nMod[X]*thisDetector->nChans*thisDetector->nChips; ichan++) {
+    for (int ichan=0; ichan<thisDetector->nMod[Y]*thisDetector->nMod[X]*thisDetector->nChans*thisDetector->nChips; ++ichan) {
       // #ifdef VERBOSE
       //       std::cout<< ichan << " "<< corr[ichan] << std::endl;
       // #endif
@@ -5552,7 +5552,7 @@ int slsDetector::getFlatFieldCorrection(double *corr, double *ecorr) {
     std::cout<< "Flat field correction is enabled" << std::endl;
 #endif
     if (corr) {
-      for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) {
+      for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ++ichan) {
 	//	corr[ichan]=(ffcoefficients[ichan]*ffcoefficients[ichan])/(fferrors[ichan]*fferrors[ichan]);
 	corr[ichan]=ffcoefficients[ichan];
 	if (ecorr) {
@@ -5567,7 +5567,7 @@ int slsDetector::getFlatFieldCorrection(double *corr, double *ecorr) {
     std::cout<< "Flat field correction is disabled" << std::endl;
 #endif
     if (corr)
-      for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) {
+      for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ++ichan) {
 	corr[ichan]=1;
 	if (ecorr)
 	  ecorr[ichan]=0;
@@ -5584,7 +5584,7 @@ int slsDetector::flatFieldCorrect(double* datain, double *errin, double* dataout
 #endif
   double e, eo;
   if (thisDetector->correctionMask & (1<<FLAT_FIELD_CORRECTION)) {
-    for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nChans*thisDetector->nChips; ichan++) {
+    for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nChans*thisDetector->nChips; ++ichan) {
       if (errin==NULL) {
 	e=0;
       } else {
@@ -5758,7 +5758,7 @@ int slsDetector::rateCorrect(double* datain, double *errin, double* dataout, dou
 #ifdef VERBOSE
     std::cout<< "Rate correcting data with dead time "<< tau << " and acquisition time "<< t << std::endl;
 #endif
-    for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) {
+    for (int ichan=0; ichan<thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ++ichan) {
 
       if (errin==NULL) {
 	e=sqrt(datain[ichan]);
@@ -5817,10 +5817,10 @@ int slsDetector::setBadChannelCorrection(int nch, int *chs, int ff) {
     if (nch<MAX_BADCHANS && nch>0) {
       thisDetector->correctionMask|=(1<<DISCARD_BAD_CHANNELS);
       thisDetector->nBadChans=0;
-      for (int ich=0 ;ich<nch; ich++) {
+      for (int ich=0 ;ich<nch; ++ich) {
 	if (chs[ich]>=0 && chs[ich]<getMaxNumberOfChannels()) {
 	  thisDetector->badChansList[ich]=chs[ich];
-	  thisDetector->nBadChans++;
+	  ++thisDetector->nBadChans;
 	  //  cout << "det : " << thisDetector->nBadChans << " " << thisDetector->badChansList[ich] << endl;
 	}
       }
@@ -5829,7 +5829,7 @@ int slsDetector::setBadChannelCorrection(int nch, int *chs, int ff) {
   } else {
     if (nch<MAX_BADCHANS && nch>0) {
       thisDetector->nBadFF=nch;
-      for (int ich=0 ;ich<nch; ich++) {
+      for (int ich=0 ;ich<nch; ++ich) {
 	thisDetector->badFFList[ich]=chs[ich];
       }
     }
@@ -5856,9 +5856,9 @@ int slsDetector::getBadChannelCorrection(int *bad) {
   int ichan;
   if (thisDetector->correctionMask&(1<< DISCARD_BAD_CHANNELS)) {
     if (bad) {
-      for (ichan=0; ichan<thisDetector->nBadChans; ichan++)
+      for (ichan=0; ichan<thisDetector->nBadChans; ++ichan)
 	bad[ichan]=thisDetector->badChansList[ichan];
-      for (int ich=0; ich<thisDetector->nBadFF; ich++)
+      for (int ich=0; ich<thisDetector->nBadFF; ++ich)
 	bad[ichan+ich]=thisDetector->badFFList[ich];
     }
     return thisDetector->nBadChans+thisDetector->nBadFF;
@@ -6401,7 +6401,7 @@ int slsDetector::configureMAC(){
 #endif
 
 
-	for(i=0;i<2;i++){
+	for(i=0;i<2;++i){
 		if(!strcmp(arg[i],"none")){
 			std::cout<< "Configure MAC Error. IP/MAC Addresses not set"<< std::endl;
 			setErrorMask((getErrorMask())|(COULD_NOT_CONFIGURE_MAC));
@@ -6546,7 +6546,7 @@ int slsDetector::configureMAC(){
 int slsDetector::getAngularConversion(int &direction,  angleConversionConstant *angconv) {
   direction=thisDetector->angDirection;
   if (angconv) {
-    for (int imod=0; imod<thisDetector->nMods; imod++) {
+    for (int imod=0; imod<thisDetector->nMods; ++imod) {
       (angconv+imod)->center=thisDetector->angOff[imod].center;
       (angconv+imod)->r_conversion=thisDetector->angOff[imod].r_conversion;
       (angconv+imod)->offset=thisDetector->angOff[imod].offset;
@@ -6842,7 +6842,7 @@ int slsDetector::readConfigurationFile(ifstream &infile){
     sargname="none";
     sargval="0";
     getline(infile,str);
-    iline++;
+    ++iline;
 #ifdef VERBOSE
     std::cout<<  str << std::endl;
 #endif
@@ -6868,7 +6868,7 @@ int slsDetector::readConfigurationFile(ifstream &infile){
 #endif
 	strcpy(myargs[iargval],sargname.c_str());
 	args[iargval]=myargs[iargval];
-	iargval++;
+	++iargval;
 	//}
       }
       ans=cmd->executeLine(iargval,args,PUT_ACTION);
@@ -6876,7 +6876,7 @@ int slsDetector::readConfigurationFile(ifstream &infile){
       std::cout<< ans << std::endl;
 #endif
     }
-    iline++;
+    ++iline;
   }
   delete cmd;
   return OK;
@@ -6978,17 +6978,17 @@ int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
   char *args[100];
   char myargs[100][1000];
 
-  for (int ia=0; ia<100; ia++) {
+  for (int ia=0; ia<100; ++ia) {
     //args[ia]=new char[1000];
 
     args[ia]=myargs[ia];
   }
 
 
-  for (iv=0; iv<nvar; iv++) {
+  for (iv=0; iv<nvar; ++iv) {
     cout << iv << " " << names[iv] << endl;
     if (names[iv]=="extsig") {
-      for (int is=0; is<nsig; is++) {
+      for (int is=0; is<nsig; ++is) {
 	sprintf(args[0],"%s:%d",names[iv].c_str(),is);
 
 	if (id>=0)
@@ -7065,17 +7065,17 @@ int slsDetector::programFPGA(string fname){
 	FILE* src = fopen(fname.c_str(),"rb");
 	FILE* dst = fopen(destfname.c_str(),"wb");
 	// Remove header (0...11C)
-	for (filepos=0; filepos < 0x11C; filepos++)
+	for (filepos=0; filepos < 0x11C; ++filepos)
 		fgetc(src);
 	// Write 0x80 times 0xFF (0...7F)
-	for (filepos=0; filepos < 0x80; filepos++)
+	for (filepos=0; filepos < 0x80; ++filepos)
 		fputc(0xFF,dst);
 	// Swap bits and write to file
-	for (filepos=0x80; filepos < 0x1000000; filepos++)	{
+	for (filepos=0x80; filepos < 0x1000000; ++filepos)	{
 		x = fgetc(src);
 		if (x < 0) break;
 		y=0;
-		for (i=0; i < 8; i++)
+		for (i=0; i < 8; ++i)
 			y=y| (   (( x & (1<<i) ) >> i)    << (7-i)     );	// This swaps the bits
 		fputc(y,dst);
 	}
@@ -7155,7 +7155,7 @@ int slsDetector::programFPGA(string fname){
 				int count = 66;
 				while(count>0){
 					usleep(1 * 1000 * 1000);
-					count--;
+					--count;
 					printf("Erasing Flash:%d%%\r",(int) (((double)(65-count)/65)*100));
 					std::cout << flush;
 				}
@@ -7297,7 +7297,7 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
     mmin=imod;
     mmax=imod+1;
   }
-  for (int im=mmin; im<mmax; im++) {
+  for (int im=mmin; im<mmax; ++im) {
     ostringstream ostfn;
     ostfn << fname;
     if(thisDetector->myDetectorType != EIGER){
@@ -7337,7 +7337,7 @@ int slsDetector::saveSettingsFile(string fname, int imod) {
     mmin=imod;
     mmax=imod+1;
   }
-  for (int im=mmin; im<mmax; im++) {
+  for (int im=mmin; im<mmax; ++im) {
     ostringstream ostfn;
     if(thisDetector->myDetectorType == EIGER){
     	ostfn << fname << ".sn"  << setfill('0') <<  setw(3) << dec << getId(DETECTOR_SERIAL_NUMBER);
@@ -7408,12 +7408,12 @@ int slsDetector::loadCalibrationFile(string fname, int imod) {
   int* gainval=0; int* offsetval=0;
   if(thisDetector->nGain){
 	  gainval=new int[thisDetector->nGain];
-	  for(int i=0;i<thisDetector->nGain;i++)
+	  for(int i=0;i<thisDetector->nGain;++i)
 		  gainval[i] = -1;
   }
   if(thisDetector->nOffset){
 	  offsetval=new int[thisDetector->nOffset];
-	  for(int i=0;i<thisDetector->nOffset;i++)
+	  for(int i=0;i<thisDetector->nOffset;++i)
 		  offsetval[i] = -1;
   }
 
@@ -7425,7 +7425,7 @@ int slsDetector::loadCalibrationFile(string fname, int imod) {
     mmin=imod;
     mmax=imod+1;
   }
-  for (int im=mmin; im<mmax; im++) {
+  for (int im=mmin; im<mmax; ++im) {
     ostringstream ostfn;
     ostfn << fname ;
     if(thisDetector->myDetectorType != EIGER){
@@ -7469,7 +7469,7 @@ int slsDetector::saveCalibrationFile(string fname, int imod) {
     mmin=imod;
     mmax=imod+1;
   }
-  for (int im=mmin; im<mmax; im++) {
+  for (int im=mmin; im<mmax; ++im) {
     ostringstream ostfn;
     if(thisDetector->myDetectorType == EIGER)
     	ostfn << fname << ".sn" << setfill('0') <<  setw(3) << dec << getId(DETECTOR_SERIAL_NUMBER);
@@ -8120,7 +8120,7 @@ int slsDetector::resetFramesCaught(){
 // 	   return NULL; 				} 				
 // 	 //jungfrau masking adcval 				
 // 	 if(thisDetector->myDetectorType == JUNGFRAU){ 					
-// 	 for(unsigned int i=0;i<nel;i++){ 						
+// 	 for(unsigned int i=0;i<nel;++i){
 // 	 retval[i] = (retval[i] & 0x3FFF3FFF); 					
 //        } 				
 //        } 			
@@ -8456,7 +8456,7 @@ int64_t slsDetector::clearAllErrorMask(){
 	clearErrorMask();
 
 	 pthread_mutex_lock(&ms);
-	for(int i=0;i<parentDet->getNumberOfDetectors();i++){
+	for(int i=0;i<parentDet->getNumberOfDetectors();++i){
 		if(parentDet->getDetectorId(i) == getDetectorId())
 			parentDet->setErrorMask(parentDet->getErrorMask()|(0<<i));
 	}
@@ -8765,7 +8765,7 @@ int slsDetector::setCTBPattern(string fname) {
        while (fread(&word, sizeof(word), 1,fd)) {
 	setCTBWord(addr,word);
 	// cout << hex << addr << " " << word << dec << endl;
-	 addr++;
+	 ++addr;
        }
        
        fclose(fd);
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
index 993bb238d..17aa3edef 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
@@ -74,35 +74,35 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 
 	descrToFuncMap[i].m_pFuncName="test"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdUnderDevelopment;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>help</b> Returns a list of possible commands.
 	 */
 	descrToFuncMap[i].m_pFuncName="help";//OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHelp;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>exitserver</b> Shuts down all the detector servers. Don't use it!!!!
 	 */
 	descrToFuncMap[i].m_pFuncName="exitserver";//OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdExitServer;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>exitreceiver</b> Shuts down all the receivers. Don't use it!!!!
 	 */
 	descrToFuncMap[i].m_pFuncName="exitreceiver";//OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdExitServer;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>flippeddatay [i]</b> enables/disables data being flipped across y axis. 1 enables, 0 disables. Not implemented.
 	 */
 	descrToFuncMap[i].m_pFuncName="flippeddatay"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/* digital test and debugging */
 
@@ -111,63 +111,63 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="digitest";  // /* find command! */
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDigiTest;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>bustest</b> performs test of the bus interface between FPGA and embedded Linux system. Can last up to a few minutes. Cannot set! Used for Mythen only. Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="bustest"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDigiTest;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>digibittest:[i]</b> performs digital test of the module i. Returns 0 if succeeded, otherwise error mask. Only put!
 	 */
 	descrToFuncMap[i].m_pFuncName="digibittest"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDigiTest;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>reg [addr] [val]</b> ??? writes to an register \c addr with \c value in hexadecimal format.
 	 */
 	descrToFuncMap[i].m_pFuncName="reg"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>adcreg [addr] [val]</b> ??? writes to an adc register \c addr with \c value in hexadecimal format. Only put!
 	 */
 	descrToFuncMap[i].m_pFuncName="adcreg"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>setbit</b> ???  Only put!
 	 */
 	descrToFuncMap[i].m_pFuncName="setbit"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>clearbit </b> ??? Only put!
 	 */
 	descrToFuncMap[i].m_pFuncName="clearbit"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>getbit </b> ??? Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="getbit"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
-	i++;
+	++i;
 
 	/*! \page test
    - <b>r_compression [i] </b> sets/gets compression in receiver. 1 sets, 0 unsets. Not implemented.</b>
 	 */
 	descrToFuncMap[i].m_pFuncName="r_compression"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 
 
@@ -181,56 +181,56 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="acquire"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAcquire;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - \b busy returns \c 1 if the acquisition is active, \c 0 otherwise. Works when the acquisition is started in blocking mode. Only get! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="busy"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - <b> status [s] </b> starts or stops acquisition in detector in non blocking mode. \c s: [\c start, \c stop]. \c Returns the detector status: [\c running, \c error, \c transmitting, \c finished, \c waiting, \c idle]. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="status"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - \b data gets all data from the detector (if any) processes them and writes them to file according to the preferences already setup (MYTHEN only). Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="data"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdData;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - \b frame gets a single frame from the detector (if any) processes it and writes it to file according to the preferences already setup (MYTHEN only). Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="frame"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFrame;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - <b>readctr </b> Reads the counters from the detector memory (analog detector returning values translated into number of photons - only GOTTHARD). Cannot put.
 	 */
 	descrToFuncMap[i].m_pFuncName="readctr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - <b>resetctr i </b> Resets counter in detector, restarts acquisition if i=1(analog detector returning values translated into number of photons - only GOTTHARD). Cannot put.
 	 */
 	descrToFuncMap[i].m_pFuncName="resetctr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
-	i++;
+	++i;
 
 	/*! \page acquisition
    - <b>resmat i </b> sets/resets counter bit in detector.gets the counter bit in detector ????
 	 */
 	descrToFuncMap[i].m_pFuncName="resmat"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
-	i++;
+	++i;
 
 
 
@@ -260,63 +260,63 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="externalgui"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDataStream;
-	i++;
+	++i;
 
 	/*! \page config
    - \b free Free shared memory on the control PC
 	 */
 	descrToFuncMap[i].m_pFuncName="free";//OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFree;
-	i++;
+	++i;
 
 	/*! \page config
    - \b add Adds a detector at the end of the multi-detector structure. \c put argument is the hostname or IP adress. Returns the chained  list of detector hostnames.
 	 */
 	descrToFuncMap[i].m_pFuncName="add";//OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdd;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>remove i</b> Removes controller \c i from the multi-detector structure. Can be used for partial readout of the detector.
 	 */
 	descrToFuncMap[i].m_pFuncName="remove";//OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRemove;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>type</b> Sets/gets detector type. \c Returns \c (string). Normally not used. Using hostname is enough.
 	 */
 	descrToFuncMap[i].m_pFuncName="type"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHostname;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>hostname</b> \c put adds the hostname (ot IP adress) at the end of the multi-detector structure. If used for a single controlled (i:) replaces the current hostname. Returns the list of the hostnames of the multi-detector structure. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="hostname"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHostname;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>id[:i]</b> Returns the id of the detector structure. i is the detector position in a multi detector system. If used a \c put, configures the id of the detector structure. i is the detector position in a multi detector system and l is the id of the detector to be added.
 	 */
 	descrToFuncMap[i].m_pFuncName="id"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdId;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>master i</b> \c put sets the position of the master of the acquisition (-1 if none). Returns the position of the master of the detector structure (-1 if none).
 	 */
 	descrToFuncMap[i].m_pFuncName="master"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdMaster;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>sync</b> Sets/gets the synchronization mode of the detectors in the multi-detector structure. Can be: \c none, \c gating, \c trigger, \c complementary. Mainly used by MYTHEN/GOTTHARD.
 	 */
 	descrToFuncMap[i].m_pFuncName="sync"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSync;
-	i++;
+	++i;
 
 	/*! \page config
 		\section configstatus Status
@@ -328,20 +328,20 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="online"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline;
-	i++;
+	++i;
 
 	/*! \page config
     - <b>checkonline</b> returns the hostnames of all detectors without connecting to them. \c Returns (string) "All online" or "[list of offline hostnames] : Not online".
 	 */
 	descrToFuncMap[i].m_pFuncName="checkonline"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline;
-	i++;
+	++i;
 	/*! \page config
     - <b>activate</b> Activates/Deactivates the detector. Deactivated detector does not send data. Used for EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="activate"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline;
-	i++;
+	++i;
 
 
 	/* detector and data size */
@@ -355,56 +355,56 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="nmod"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>maxmod </b> Gets the maximum number of modules of the detector. Used for MYTHEN only. Cannot put! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="maxmod"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>dr [i]</b> sets/gets the dynamic range of detector. Mythen [4,8,16,24]. Eiger [4,8,16,32]. Others cannot put! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="dr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>roi [i] [xmin] [xmax] [ymin] [ymax]  </b> sets region of interest of the detector, where i is number of rois;i=0 to clear rois. Used for GOTTHARD only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="roi"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>detsizechan [xmax] [ymax]</b> sets the maximum number of channels in each dimension for complete detector set; -1 is no limit. Use for multi-detector system as first command in config file. \c Returns \c ("int int")
 	 */
 	descrToFuncMap[i].m_pFuncName="detsizechan"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>roimask [i]</b>  ?? \c Returns \c (int) in hexadecimal
 	 */
 	descrToFuncMap[i].m_pFuncName="roimask"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>flippeddatax [i]</b> enables/disables data being flipped across x axis. 1 enables, 0 disables. Used for EIGER only. 1 for bottom half-module, 0 for top-half module. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="flippeddatax"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>tengiga [i]</b> enables/disables 10GbE in system (detector & receiver). 1 enabled 10GbE, 0 enables 1GbE. Used in EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="tengiga"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 
 	/* flags */
@@ -418,7 +418,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="flags";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>extsig:[i] [flag]</b> sets/gets the mode of the external signal i. Options: \c off, \c gate_in_active_high, \c gate_in_active_low, \c trigger_in_rising_edge, \c trigger_in_falling_edge,
@@ -427,7 +427,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	*/
 	descrToFuncMap[i].m_pFuncName="extsig"; /* find command! */
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
-	i++;
+	++i;
 
 
 	/* fpga */
@@ -438,14 +438,14 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="programfpga";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>resetfpga [f]</b> resets FPGA, where f can be any value. Used for JUNGFRAU only. Only put! \c Returns \c ("successful", "unsuccessful")
 	 */
 	descrToFuncMap[i].m_pFuncName="resetfpga";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
-	i++;
+	++i;
 
 
 	/* chip */
@@ -459,35 +459,35 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="powerchip";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>led [i]</b> sets/gets the led status. 1 on, 0 off. Used for MOENCH only ?? \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="led";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>pulse [n] [x] [y]</b> pulses pixel at coordinates (x,y) n number of times. Used in EIGER only. Only put! \c Returns \c ("successful", "unsuccessful")
 	 */
 	descrToFuncMap[i].m_pFuncName="pulse"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPulse;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>pulsenmove [n] [x] [y]</b> pulses pixel n number of times and moves relatively by x value (x axis) and y value(y axis). Used in EIGER only. Only put! \c Returns \c ("successful", "unsuccessful")
 	 */
 	descrToFuncMap[i].m_pFuncName="pulsenmove"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPulse;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>pulsechip [n]</b>pulses chip n number of times, while n=-1 will reset it to normal mode. Used in EIGER only. Only put! \c Returns \c ("successful", "unsuccessful")
 	 */
 	descrToFuncMap[i].m_pFuncName="pulsechip"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPulse;
-	i++;
+	++i;
 
 
 
@@ -503,49 +503,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="moduleversion"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>detectornumber</b> Gets the serial number or MAC of detector. Only get! \c Returns \c (long int) in hexadecimal
 	 */
 	descrToFuncMap[i].m_pFuncName="detectornumber"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>modulenumber:[i]</b> Gets the serial number of module i. Used for MYTHEN only. Only get! \c Returns \c (long int) in hexadecimal or "undefined module number"
 	 */
 	descrToFuncMap[i].m_pFuncName="modulenumber"; /* find command! */
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>detectorversion</b> Gets the firmware version of detector. Only get! \c Returns \c (long int) in hexadecimal
 	 */
 	descrToFuncMap[i].m_pFuncName="detectorversion"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>softwareversion</b> Gets the software version of detector server. Only get! \c Returns \c (long int) in hexadecimal
 	 */
 	descrToFuncMap[i].m_pFuncName="softwareversion"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>thisversion</b> Gets the software version of this client software. Only get! \c Returns \c (long int) in hexadecimal
 	 */
 	descrToFuncMap[i].m_pFuncName="thisversion"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>receiverversion</b> Gets the software version of receiver. Only get! \c Returns \c (long int) in hexadecimal
 	 */
 	descrToFuncMap[i].m_pFuncName="receiverversion"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
-	i++;
+	++i;
 
 	/* r/w timers */
 
@@ -555,7 +555,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	*/
 	descrToFuncMap[i].m_pFuncName="timing"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTiming;
-	i++;
+	++i;
 
 
 	/*! \page timing
@@ -563,70 +563,70 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="exptime"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>subexptime [i]</b> sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="subexptime"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>period [i]</b> sets/gets frame period in s. \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="period"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>delay [i]</b> sets/gets delay in s. Used in MYTHEN, GOTTHARD only. \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="delay"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>gates [i]</b> sets/gets number of gates. Used in MYTHEN, GOTTHARD only. \c Returns \c (long long int)
 	 */
 	descrToFuncMap[i].m_pFuncName="gates"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>frames [i]</b> sets/gets number of frames. If \c timing is not \c auto, then it is the number of frames per cycle/trigger. \c Returns \c (long long int)
 	 */
 	descrToFuncMap[i].m_pFuncName="frames"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>cycles [i]</b> sets/gets number of triggers. Timing mode should be set appropriately. \c Returns \c (long long int)
 	 */
 	descrToFuncMap[i].m_pFuncName="cycles"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>probes [i]</b> sets/gets number of probes to accumulate. When setting, max 3! cycles should be set to 1, frames to the number of pump-probe events. Used in MYTHEN only. \c Returns \c (long long int)
 	 */
 	descrToFuncMap[i].m_pFuncName="probes"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>measurements [i]</b> sets/gets number of measurements. \c Returns \c (long long int)
 	 */
 	descrToFuncMap[i].m_pFuncName="measurements"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>samples [i]</b> sets/gets number of samples expected from the jctb. Used in CHIP TEST BOARD only. \c Returns \c (long long int)
 	 */
 	descrToFuncMap[i].m_pFuncName="samples"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	i++;
+	++i;
 
 	/* read only timers */
 
@@ -635,74 +635,74 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="exptimel"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>periodl</b> gets frame period left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="periodl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>delayl</b> gets delay left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="delayl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>gatesl</b> gets number of gates left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="gatesl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>framesl</b> gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="framesl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>cyclesl</b> gets number of cylces left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="cyclesl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>probesl</b> gets number of probes left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits)
 	 */
 	descrToFuncMap[i].m_pFuncName="probesl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	//   descrToFuncMap[i].m_pFuncName="progress";
 	//   descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer;
-	//   i++;
+	//   ++i;
 
 	/*! \page timing
    - <b>now</b> Actual time of the detector. Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="now"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>timestamp</b> Last frame timestamp for MYTHEN. Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="timestamp"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/*! \page timing
    - <b>nframes</b> ??? Only get!
 	 */
 	descrToFuncMap[i].m_pFuncName="nframes"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft;
-	i++;
+	++i;
 
 	/* speed */
 	/*! \page config
@@ -715,91 +715,91 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="clkdivider"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>setlength [i]</b> sets/gets length of set/reset signals (in clock cycles). Used in MYTHEN only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="setlength"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>waitstates [i]</b> sets/gets waitstates of the bus interface (in clock cycles). Used in MYTHEN only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="waitstates"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>totdivider [i]</b> sets/gets clock divider in tot mode. Used in MYTHEN only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="totdivider"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>totdutycycle [i]</b> sets/gets duty cycle of the tot clock. Used in MYTHEN only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="totdutycycle"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>phasestep [i]</b> Only put for gotthard. Moves the phase of the ADC clock.\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="phasestep"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>oversampling [i]</b> Sets/gets the number of adcsamples per clock. For the new chiptestboard.\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="oversampling"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>adcclk [i]</b> sets/gets the ADC clock frequency in MHz. For the new chiptestboard!\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="adcclk"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>adcphase [i]</b> Sets/gets the ADC clock frequency in MHz. For the new chiptestboard!\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="adcphase"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>adcpipeline [i]</b> Sets/gets the pipeline of the ADC. For the new chiptestbaord!\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="adcpipeline"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>dbitclk [i]</b> Sets/gets the clock frequency of the latching of the digital bits in MHz. For the new chiptestboard!\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="dbitclk"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>dbitphase [i]</b> Sets/gets the phase of the clock for  latching of the digital bits. For the new chiptestboard!?\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="dbitphase"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>dbitpipeline [i]</b> Sets/gets the pipeline of the latching of the digital bits. For the new chiptestbaord!\c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="dbitpipeline"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed;
-	i++;
+	++i;
 
 
 	/* settings dump/retrieve */
@@ -813,7 +813,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="config";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration;
-	i++;
+	++i;
 
 	/* settings dump/retrieve */
 	/*! \page config
@@ -821,21 +821,21 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_printconfig";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>parameters [fname]</b> sets/saves detector parameters contained in fname. Normally once per different measurement. \c Returns \c (string) fname
 	 */
 	descrToFuncMap[i].m_pFuncName="parameters";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration;
-	i++;
+	++i;
 
 	/*! \page config
    - <b>setup [fname]</b> sets/saves detector complete setup contained in fname (extensions automatically generated), including trimfiles, ff coefficients etc.  \c Returns \c (string) fname
 	 */
 	descrToFuncMap[i].m_pFuncName="setup";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration;
-	i++;
+	++i;
 
 
 
@@ -851,42 +851,42 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="flatfield"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFlatField;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>ffdir [d]</b> Sets/gets the directory in which the flat field file is located. \c Returns \c (string) ffdir
 	 */
 	descrToFuncMap[i].m_pFuncName="ffdir"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFlatField;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>ratecorr [ns]</b> Returns the dead time used for rate correections in ns (int). \c put sets the deadtime correction constant in ns, -1  will set it to default tau of settings (0 unset).  \c Returns \c (double with 9 decimal digit precision)
 	 */
 	descrToFuncMap[i].m_pFuncName="ratecorr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRateCorr;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>badchannels [fn]</b> \c put sets the badchannels file to \c fn . \get returns the bad channels file name. If \fn is specified, it writes the badchannels to \c fn. \c none disables badchannel corrections.
 	 */
 	descrToFuncMap[i].m_pFuncName="badchannels"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdBadChannels;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>angconv [fn]</b> \c put sets the angular conversion file to \c fn . \get returns the angular conversion file name. If \fn is specified, it writes the angular conversion factors to \c fn. \c none disables angular corrections.
 	 */
 	descrToFuncMap[i].m_pFuncName="angconv"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>globaloff [f]</b> Sets/gets the beamline angular global offset (float).
 	 */
 	descrToFuncMap[i].m_pFuncName="globaloff"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>fineoff [f]</b> Sets/gets the angular fine offset of the measurement (float).
@@ -894,63 +894,63 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	//2017/08/15
 	descrToFuncMap[i].m_pFuncName="fineoff"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>binsize [f]</b> Sets/gets the bin size used for the angular conversion (float).
 	 */
 	descrToFuncMap[i].m_pFuncName="binsize" ;//
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>angdir [i]</b> Sets/gets the angular direction. 1 means increasing channels number as increasing angle, -1 increasing channel number decreasing angle.
 	 */
 	descrToFuncMap[i].m_pFuncName="angdir" ;//
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>moveflag [i]</b> Sets/gets the flag for physically moving the detector during the acquisition of several positions. 1 sets (moves), 0 unsets.
 	 */
 	descrToFuncMap[i].m_pFuncName="moveflag" ;//
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>samplex [f]</b> Sets/gets the sample displacement in th direction parallel to the beam in um. Unused!
 	 */
 	descrToFuncMap[i].m_pFuncName="samplex" ;//
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>sampley [f]</b> Sets/gets the sample displacement in th direction orthogonal to the beam in um. Unused!
 	 */
 	descrToFuncMap[i].m_pFuncName="sampley" ;//
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAngConv;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>threaded [i]</b> Sets/gets the data processing threaded flag. 1 is threaded, 0 unthreaded.
 	 */
 	descrToFuncMap[i].m_pFuncName="threaded"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdThreaded;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>darkimage fn</b> Loads the dark image to the detector from file fn (pedestal image). Cannot get.
 	 */
 	descrToFuncMap[i].m_pFuncName="darkimage"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdImage;
-	i++;
+	++i;
 
 	/*! \page data
    - <b>gainimage fn</b> Loads the gain image to the detector from file fn (gain map for translation into number of photons of an analog detector). Cannot get.
 	 */
 	descrToFuncMap[i].m_pFuncName="gainimage"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdImage;
-	i++;
+	++i;
 
 
 
@@ -977,27 +977,27 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="settingsdir"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettingsDir;
-	i++;
+	++i;
 	/*! \page settings
    - <b>trimdir [dir]</b> obsolete \c settingsdir. \c Returns \c (string) dir
 	 */
 	descrToFuncMap[i].m_pFuncName="trimdir"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettingsDir;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>caldir [dir]</b> Sets/gets the directory where the calibration files are located. \c Returns \c (string) dir
 	 */
 	descrToFuncMap[i].m_pFuncName="caldir"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCalDir;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>trimen [n e0 e1...e(n-1)]</b> Sets/gets the number of energies n at which the detector has default trim file and their values in eV (int). \c Returns \c (int int...) n e0 e1...e(n-1)
 	 */
 	descrToFuncMap[i].m_pFuncName="trimen";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTrimEn;
-	i++;
+	++i;
 
 	/* settings, threshold */
 	/*! \page settings
@@ -1012,49 +1012,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="settings"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>threshold [eV] [sett] </b> sets/gets the detector threshold in eV. sett is optional and if provided also sets the settings. Use this for Eiger instead of \c settings. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="threshold"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>thresholdnotb [eV] [sett] </b> sets/gets the detector threshold in eV without loading trimbits. sett is optional and if provided also sets the settings. Use this for Eiger instead of \c settings. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="thresholdnotb"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>trimbits [fname] </b> loads/stores the trimbits to/from the detector. If no extension is specified, the serial number of each module will be attached. \c Returns \c (string) fname
 	 */
 	descrToFuncMap[i].m_pFuncName="trimbits"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>trim:[mode] [fname]</b> trims the detector according to mode and saves resulting trimbits to file. Mode: noise, beam, improve, fix. Used in MYTHEN only. Only put!  \c Returns \c ("done")
 	 */
 	descrToFuncMap[i].m_pFuncName="trim"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>trimval [i]</b> sets all trimbits to i. Used in EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="trimval"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>pedestal [i]</b> starts acquisition for i frames, calculates pedestal and writes back to fpga. Used in GOTTHARD only. Only put! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="pedestal"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings;
-	i++;
+	++i;
 
 
 
@@ -1069,287 +1069,287 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="vthreshold"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcalibration [i] [mv]</b> Sets/gets the voltage of the calibration pulses. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcalibration"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vtrimbit [i] [mv]</b> Sets/gets the voltage to set the width of the trimbits. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vtrimbit"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vpreamp [i] [mv]</b> Sets/gets the voltage to define the preamplifier feedback resistance. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vpreamp"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vhaper1 [i] [mv]</b> Sets/gets the voltage to define the  feedback resistance of the first shaper. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vshaper1"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vshaper2 [i] [mv]</b> Sets/gets the voltage to define the  feedback resistance of the second shaper. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vshaper2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vhighvoltage [i]</b> Sets/gets the high voltage to the sensor in V. \c Returns \c (int ["mV"]).
 	 */
 	descrToFuncMap[i].m_pFuncName="vhighvoltage"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vapower [i]</b> Sets/gets the analog power supply for the old chiptest board in DAC units. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vapower"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vddpower [i]</b> Sets/gets the digital power supply for the old chiptest board in DAC units. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vddpower"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vshpower [i]</b> Sets/gets the comparator power supply for the old chiptest board in DAC units. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vshpower"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>viopower [i]</b> Sets/gets the power supply of the FPGA I/Os for the old chiptest board in DAC units. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="viopower"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vrefds [i] [mv]</b> Sets/gets vrefds. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vref_ds"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcascn_pb [i] [mv]</b> Sets/gets vcascn_pb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcascn_pb"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcasc_pb [i] [mv]</b> Sets/gets vcasc_pb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcascp_pb"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vout_cm [i] [mv]</b> Sets/gets vout_cm. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vout_cm"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcasc_out [i] [mv]</b> Sets/gets vcasc_out. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcasc_out"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vin_com [i] [mv]</b> Sets/gets vin_com. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vin_cm"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vref_comp [i] [mv]</b> Sets/gets vref_comp. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vref_comp"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>ib_test_c [i] [mv]</b> Sets/gets ib_test_c. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="ib_test_c"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>dac[0..7] [i] [mv]</b> Sets/gets dac[0..7] for MOENCH02. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="dac0"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac1"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac3"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac4"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac5"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac6"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	descrToFuncMap[i].m_pFuncName="dac7"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vsvp [i] [mv]</b> Sets/gets vsvp. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vsvp"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vsvn [i] [mv]</b> Sets/gets vsvn. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vsvn"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vtr [i] [mv]</b> Sets/gets vtr. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vtr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vrf [i] [mv]</b> Sets/gets vrf. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vrf"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vrs [i] [mv]</b> Sets/gets vrs. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vrs"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vtgstv [i] [mv]</b> Sets/gets vtgstv. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vtgstv"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcmp_ll [i] [mv]</b> Sets/gets vcmp_ll. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcmp_ll"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcmp_lr [i] [mv]</b> Sets/gets vcmp_lr. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcmp_lr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcal_l [i] [mv]</b> Sets/gets vcal_l. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcall"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcomp_rl [i] [mv]</b> Sets/gets vcomp_rl. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcmp_rl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcomp_rr [i] [mv]</b> Sets/gets vcomp_rr. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcmp_rr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>rxb_rb [i] [mv]</b> Sets/gets rxb_rb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="rxb_rb"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>rxb_lb [i] [mv]</b> Sets/gets rxb_lb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="rxb_lb"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcp [i] [mv]</b> Sets/gets vcp. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcp"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vcn [i] [mv]</b> Sets/gets vcn. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vcn"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vis [i] [mv]</b> Sets/gets vis. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="vis"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>iodelay [i] [mv]</b> Sets/gets iodelay. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="iodelay"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 
 	/*! \page settings
@@ -1357,7 +1357,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="dac"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 
 
@@ -1366,7 +1366,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="adcvpp"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 
 	/*! \page settings
@@ -1374,35 +1374,35 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="v_a"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>v_b [i] mv</b> Sets/gets value for Vb on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="v_b"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>v_c [i] mv</b> Sets/gets value for Vc on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="v_c"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>v_d [i] mv</b> Sets/gets value for Vd on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="v_d"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>v_io [i] mv</b> Sets/gets value for Vio on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="v_io"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 
 	/*! \page settings
@@ -1410,14 +1410,14 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="v_chip"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>v_limit [i] mv</b> Sets/gets a soft limit for the power supplies and the DACs on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"])
 	 */
 	descrToFuncMap[i].m_pFuncName="v_limit"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC;
-	i++;
+	++i;
 
 	/* r/w timers */
 	/*! \page settings
@@ -1430,49 +1430,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_adc"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_fpga</b> Gets the FPGA temperature. \c Returns \c EIGER,JUNGFRAU(double"°C") Others \c (int"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_fpga"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_fpgaext</b> Gets the external FPGA temperature. Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_fpgaext"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_10ge</b> Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_10ge"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_dcdc</b> Gets the temperature of the DC/DC converter. Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_dcdc"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_sodl</b> Gets the temperature of the left so-dimm memory . Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_sodl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_sodr</b> Gets the temperature of the right so-dimm memory. Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_sodr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 
 	/*! \page settings
@@ -1480,21 +1480,21 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="adc"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_fpgal</b> Gets the temperature of the left frontend FPGA. Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_fpgafl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>temp_fpgar</b> Gets the temperature of the right frontend FPGA. Used in EIGER only. \c Returns \c EIGER(double"°C")
 	 */
 	descrToFuncMap[i].m_pFuncName="temp_fpgafr"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 
 	/*! \page settings
@@ -1502,70 +1502,70 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="i_a"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>i_b</b> Gets the current of the power supply b on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="i_b"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>i_c</b> Gets the current of the power supply c on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="i_c"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>i_d</b> Gets the current of the power supply d on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="i_d"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>i_io</b> Gets the current of the power supply io on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="i_io"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vm_a</b> Gets the measured voltage of the power supply a on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="vm_a"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vm_b</b> Gets the measured voltage of the power supply b on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="vm_b"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vm_c</b> Gets the measured voltage of the power supply c on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="vm_c"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vm_d</b> Gets the measured voltage of the power supply d on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="vm_d"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 	/*! \page settings
    - <b>vm_io</b> Gets the measured voltage of the power supply io on the new chiptest board \c Returns \c (int"mV")
 	 */
 	descrToFuncMap[i].m_pFuncName="vm_io"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
-	i++;
+	++i;
 
 
 
@@ -1581,49 +1581,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="outdir"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOutDir;
-	i++;
+	++i;
 
 	/*! \page output
    - <b>fname [fn]</b> Sets/gets the root of the output file name \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="fname"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFileName;
-	i++;
+	++i;
 
 	/*! \page output
    - <b>index [i]</b> Sets/gets the current file index. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="index"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFileIndex;
-	i++;
+	++i;
 
 	/*! \page output
    - <b>enablefwrite [i]</b> Enables/disables file writing. 1 enables, 0 disables. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="enablefwrite"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdEnablefwrite;
-	i++;
+	++i;
 
 	/*! \page output
     - <b>overwrite [i]</b> enables(1) /disables(0) file overwriting. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="overwrite"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOverwrite;
-	i++;
+	++i;
 
 	/*! \page output
     - <b>currentfname</b> gets the filename for the data without index and extension. MYTHEN only. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="currentfname"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFileName;
-	i++;
+	++i;
 
 	/*! \page output
     - <b>fileformat</b> sets/gets the file format for data in receiver. Options: [ascii, binary, hdf5]. Ascii is not implemented in Receiver. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="fileformat"; //OK
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFileName;
-	i++;
+	++i;
 
 
 
@@ -1639,133 +1639,133 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="positions"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPositions;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>startscript [s]</b> sets/gets the script to be executed at the beginning of the acquisition. \c none unsets. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="startscript"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>startscriptpar [s]</b> sets/gets a string to be passed as a parameter to the startscript. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="startscriptpar"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>stopscript [s]</b> sets/gets the script to be executed at the end of the acquisition. \c none unsets. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="stopscript"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>stopscriptpar [s]</b> sets/gets a string to be passed as a parameter to the stopscript. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="stopscriptpar"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scriptbefore [s]</b> sets/gets the script to be executed before starting the detector every time in the acquisition. \c none unsets. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="scriptbefore"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scriptbeforepar [s]</b> sets/gets a string to be passed as a parameter to the scriptbefore. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="scriptbeforepar"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scriptafter [s]</b> sets/gets the script to be executed after the detector has finished  every time in the acquisition. \c none unsets. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="scriptafter"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scriptafterpar [s]</b> sets/gets a string to be passed as a parameter to the scriptafter. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="scriptafterpar"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>headerafter [s]</b> sets/gets the script to be executed for logging the detector parameters. \c none unsets. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="headerafter"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>headerbefore [s]</b> sets/gets the script to be executed for logging the detector parameters. \c none unsets. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="headerbefore"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>headerbeforepar [s]</b> sets/gets a string to be passed as a parameter to the headerbefore script. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="headerbeforepar"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>headerafterpar [s]</b> sets/gets a string to be passed as a parameter to the headerafter script. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="headerafterpar"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>enacallog [i]</b> enables/disables logging of the parameters necessary for the energy calibration. 1 sets, 0 unsets. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="encallog"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>angcallog [i]</b> enables/disables logging of the parameters necessary for the angular calibration. 1 sets, 0 unsets. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="angcallog"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScripts;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan0script [s]</b> sets/gets the script to be executed for the scan 0 level. \c none unsets.
 	 */
 	descrToFuncMap[i].m_pFuncName="scan0script"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan0par [s]</b> sets/gets a string to be passed as a parameter to the scan0script
 	 */
 	descrToFuncMap[i].m_pFuncName="scan0par"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan0prec [i]</b> sets/gets number of digits to be used for the scan0 variable in the file name.
 	 */
 	descrToFuncMap[i].m_pFuncName="scan0prec"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan0steps [i [s0..sn-1]]</b> sets/gets number of steps (int) of the scan0 level and their values (float).
 	 */
 	descrToFuncMap[i].m_pFuncName="scan0steps"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 
 	/*! \page actions
@@ -1773,42 +1773,42 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="scan0range"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan1script [s]</b> sets/gets the script to be executed for the scan1 level. \c none unsets.
 	 */
 	descrToFuncMap[i].m_pFuncName="scan1script"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan1par [s]</b> sets/gets a string to be passed as a parameter to the scan1script
 	 */
 	descrToFuncMap[i].m_pFuncName="scan1par"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan1prec [i]</b> sets/gets number of digits to be used for the scan1 variable in the file name.
 	 */
 	descrToFuncMap[i].m_pFuncName="scan1prec"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan1steps [i [s0..sn-1]]</b> sets/gets number of steps (int) of the scan1 level and their values (float).
 	 */
 	descrToFuncMap[i].m_pFuncName="scan1steps"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 	/*! \page actions
     - <b>scan1range [smin smax sstep]</b> sets scan1 min, max and step, returns the number of steps and their values as scan1steps.
 	 */
 	descrToFuncMap[i].m_pFuncName="scan1range"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdScans;
-	i++;
+	++i;
 
 
 
@@ -1822,111 +1822,111 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_hostname"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 	/*! \page network
    - <b>rx_udpip [ip]</b> sets/gets the ip address of the receiver UDP interface where the data from the detector will be streamed to. Normally used for single detectors (Can be multi-detector). Used if different from eth0. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_udpip"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>rx_udpmac [mac]</b> sets/gets the mac address of the receiver UDP interface where the data from the detector will be streamed to. Normally used for single detectors (Can be multi-detector). \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_udpmac"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>rx_udpport [port]</b> sets/gets the port of the receiver UDP interface where the data from the detector will be streamed to. Use single-detector command. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_udpport"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>rx_udpport2 [port]</b> sets/gets the second port of the receiver UDP interface where the data from the second half of the detector will be streamed to. Use single-detector command. Used for EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_udpport2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>detectormac [mac]</b> sets/gets the mac address of the detector UDP interface from where the detector will stream data. Use single-detector command. Normally unused. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="detectormac"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>detectorip [ip]</b> sets/gets the ip address of the detector UDP interface from where the detector will stream data. Use single-detector command. Keep in same subnet as rx_udpip (if rx_udpip specified). \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="detectorip"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>txndelay_left [delay]</b> sets/gets the transmission delay of first packet in an image being streamed out from the detector's left UDP port. Use single-detector command. Used for EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="txndelay_left"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>txndelay_right [delay]</b> sets/gets the transmission delay of first packet in an image being streamed out from the detector's right UDP port. Use single-detector command. Used for EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="txndelay_right"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>txndelay_frame [delay]</b> sets/gets the transmission frame period of entire frame being streamed out from the detector for both ports. Use single-detector command. Used for EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="txndelay_frame"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>flowcontrol_10g [delay]</b> Enables/disables 10 GbE flow control. 1 enables, 0 disables. Used for EIGER only. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="flowcontrol_10g"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>zmqport [port]</b> sets/gets the 0MQ (TCP) port of the receiver from where data is streamed to the client. Use single-detector command to set individually or multi-detector command to calculate based on \c port for the rest. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="zmqport"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>configuremac [i]</b> configures the MAC of the detector with these parameters: detectorip, detectormac, rx_udpip, rx_udpmac, rx_udpport, rx_udpport2 (if applicable). This command is already included in \c rx_hsotname. Only put!. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="configuremac"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfigureMac;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>rx_tcpport [port]</b> sets/gets the port of the client-receiver TCP interface. Use single-detector command. Is different for each detector if same \c rx_hostname used. Must be first command to communicate with receiver. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_tcpport"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPort;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>port [port]</b> sets/gets the port of the client-detector control server TCP interface. Use single-detector command. Default value is 1952 for all detectors. Normally not changed. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="port"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPort;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>stopport [port]</b> sets/gets the port of the client-detector stop server TCP interface. Use single-detector command. Default value is 1953 for all detectors. Normally not changed. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="stopport"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPort;
-	i++;
+	++i;
 
 
 	/*! \page network
@@ -1934,14 +1934,14 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="lock"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdLock;
-	i++;
+	++i;
 
 	/*! \page network
    - <b>lastclient </b> Gets the last client communicating with the detector. Cannot put!. \c Returns \c (string)
 	 */
 	descrToFuncMap[i].m_pFuncName="lastclient"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdLastClient;
-	i++;
+	++i;
 
 
 
@@ -1967,21 +1967,21 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="receiver";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>r_online [i]</b> sets/gets the receiver in online/offline mode. 1 is online, 0 is offline. Get is from shared memory. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="r_online";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>r_checkonline</b> Checks the receiver if it is online/offline mode. Only get! \c Returns (string) "All online" or "[list of offline hostnames] : Not online".
 	 */
 	descrToFuncMap[i].m_pFuncName="r_checkonline";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline;
-	i++;
+	++i;
 
 
 	/*! \page receiver
@@ -1989,49 +1989,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="framescaught";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>resetframescaught [i]</b> resets the number of frames caught to 0. i can be any number. Use this if using status start, instead of acquire (this command is included). Only put! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="resetframescaught";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>frameindex [i]</b> gets the current frame index of receiver. Average of all for multi-detector command. Only get! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="frameindex";
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>r_lock [i]</b> locks/unlocks the receiver to communicate with only this client. 1 locks, 0 unlocks. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="r_lock"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdLock;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>r_lastclient</b> gets the last client communicating with the receiver. Only get! \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="r_lastclient"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdLastClient;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>r_readfreq [i]</b> sets/gets the stream frequency of data from receiver to client. i > 0 is the nth frame being streamed. 0 sets frequency to a default timer (200ms). \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="r_readfreq"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 	/*! \page receiver
    - <b>rx_fifodepth [i]</b> sets/gets receiver fifo (between Listener and Writer Threads) depth to i number of frames. Can improve listener packet loss (loss due to packet processing time in Listener threads), not if limited by writing. \c Returns \c (int)
 	 */
 	descrToFuncMap[i].m_pFuncName="rx_fifodepth"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver;
-	i++;
+	++i;
 
 
 
@@ -2046,140 +2046,140 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det)  {
 	 */
 	descrToFuncMap[i].m_pFuncName="adcinvert"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>adcdisable [mask]</b> Sets/gets ADC disable mask (8 digits hex format)
 	 */
 	descrToFuncMap[i].m_pFuncName="adcdisable"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>pattern fn</b> loads binary pattern file fn
 	 */
 	descrToFuncMap[i].m_pFuncName="pattern"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patword addr [word]</b> sets/gets 64 bit word at address addr of pattern memory. Both address and word in hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patword"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patioctrl [word]</b> sets/gets 64 bit mask defining input (0) and output (1) signals. hex format.
 	 */
 	descrToFuncMap[i].m_pFuncName="patioctrl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patclkctrl [word]</b> sets/gets 64 bit mask defining if output signal is a clock and runs. hex format. Unused at the moment.
 	 */
 	descrToFuncMap[i].m_pFuncName="patclkctrl"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patlimits [addr1 addr2]</b> sets/gets the start and stop limits of the pattern to be executed. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patlimits"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patloop0 [addr1 addr2]</b> sets/gets the start and stop limits of the level 0 loop. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patloop0"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patnloop0 [n]</b> sets/gets the number of cyclesof the  level 0 loop (int).
 	 */
 	descrToFuncMap[i].m_pFuncName="patnloop0"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patwait0 [addr]</b> sets/gets the address of the level 0 wait point. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patwait0"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patwaittime0 [n]</b> sets/gets the duration of the witing of the 0 waiting point in clock cycles (int).
 	 */
 	descrToFuncMap[i].m_pFuncName="patwaittime0"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patloop1 [addr1 addr2]</b> sets/gets the start and stop limits of the level 1 loop. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patloop1"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patnloop1 [n]</b> sets/gets the number of cyclesof the  level 1 loop (int).
 	 */
 	descrToFuncMap[i].m_pFuncName="patnloop1"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patwait1 [addr]</b> sets/gets the address of the level 1 wait point. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patwait1"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patwaittime1 [n]</b> sets/gets the duration of the witing of the 1 waiting point in clock cycles (int).
 	 */
 	descrToFuncMap[i].m_pFuncName="patwaittime1"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patloop2 [addr1 addr2]</b> sets/gets the start and stop limits of the level 2 loop. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patloop2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patnloop2 [n]</b> sets/gets the number of cyclesof the  level 2 loop (int).
 	 */
 	descrToFuncMap[i].m_pFuncName="patnloop2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patwait2 [addr]</b> sets/gets the address of the level 2 wait point. hex format. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="patwait2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>patwaittime2 [n]</b> sets/gets the duration of the waiting of the 2 waiting point in clock cycles (int).
 	 */
 	descrToFuncMap[i].m_pFuncName="patwaittime2"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 	/*! \page ctb
    - <b>dut_clk [i]</b> sets/gets the signal to be used as a clock for the digital data coming from the device under test. Advanced!
 	 */
 	descrToFuncMap[i].m_pFuncName="dut_clk"; //
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPattern;
-	i++;
+	++i;
 
 
 
@@ -2624,7 +2624,7 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
 			//add by type
 			if (ivar==-1) {
 				strcpy(hostname,"");
-				for (int id=1; id<narg; id++) {
+				for (int id=1; id<narg; ++id) {
 					strcat(hostname,args[id]);
 					if(narg>2)
 						strcat(hostname,"+");
@@ -2640,7 +2640,7 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
 			//add by hostname
 			if (ivar==-1) {
 				strcpy(hostname,"");
-				for (int id=1; id<narg; id++) {
+				for (int id=1; id<narg; ++id) {
 					strcat(hostname,args[id]);
 					if(narg>2)
 						strcat(hostname,"+");
@@ -2906,7 +2906,7 @@ string slsDetectorCommand::cmdTrimEn(int narg, char *args[], int action){
 	if (action==PUT_ACTION) {
 		if (sscanf(args[1],"%d",&ival)) {
 			int pos[ival];
-			for (ip=0; ip<ival;ip++) {
+			for (ip=0; ip<ival;++ip) {
 				if ((2+ip)<narg) {
 					if (sscanf(args[2+ip],"%d",pos+ip)) {
 					} else
@@ -2920,7 +2920,7 @@ string slsDetectorCommand::cmdTrimEn(int narg, char *args[], int action){
 	sprintf(answer,"%d",npos);
 	int opos[npos];
 	myDet->getTrimEn(opos);
-	for (int ip=0; ip<npos;ip++) {
+	for (int ip=0; ip<npos;++ip) {
 		sprintf(answer,"%s %d",answer,opos[ip]);
 	}
 	return string(answer);
@@ -3238,7 +3238,7 @@ string slsDetectorCommand::cmdBadChannels(int narg, char *args[], int action){
 				ofstream outfile;
 				outfile.open (sval.c_str(),ios_base::out);
 				if (outfile.is_open()) {
-					for (int ich=0; ich<nbch; ich++) {
+					for (int ich=0; ich<nbch; ++ich) {
 						outfile << bch[ich] << std::endl;
 					}
 					outfile.close();
@@ -3548,7 +3548,7 @@ string slsDetectorCommand::cmdPositions(int narg, char *args[], int action){
 	if (action==PUT_ACTION) {
 		if (sscanf(args[1],"%d",&ival)) {
 			double pos[ival];
-			for (ip=0; ip<ival;ip++) {
+			for (ip=0; ip<ival;++ip) {
 				if ((2+ip)<narg) {
 					if (sscanf(args[2+ip],"%lf",pos+ip)) {
 #ifdef VERBOSE
@@ -3565,7 +3565,7 @@ string slsDetectorCommand::cmdPositions(int narg, char *args[], int action){
 	sprintf(answer,"%d",npos);
 	double opos[npos];
 	myDet->getPositions(opos);
-	for (int ip=0; ip<npos;ip++) {
+	for (int ip=0; ip<npos;++ip) {
 		sprintf(answer,"%s %f",answer,opos[ip]);
 	}
 	return string(answer);
@@ -3723,10 +3723,10 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 					return string("too many steps required!");
 
 				values=new double[ival];
-				for (int i=0; i<ival; i++) {
+				for (int i=0; i<ival; ++i) {
 					if (narg>=(i+2)) {
 						if (sscanf(args[i+2],"%lf",values+i))
-							ns++;
+							++ns;
 						else
 							break;
 					} else
@@ -3746,7 +3746,7 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 			int p=myDet->getScanPrecision(is);
 			char format[1000];
 			sprintf(format, "%%s %%0.%df",p);
-			for (int i=0; i<ns; i++) {
+			for (int i=0; i<ns; ++i) {
 				sprintf(answer,format,answer,values[i]);
 			}
 			delete [] values;
@@ -3785,7 +3785,7 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 			ns=(int)((fmax-fmin)/fstep);
 			if (ns<0)
 				ns=-1*ns;
-			ns++;
+			++ns;
 
 			if (ns>MAX_SCAN_STEPS)
 				return string("too many steps required!");
@@ -3800,7 +3800,7 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 
 
 			values=new double[ns];
-			for (int i=0; i<ns; i++) {
+			for (int i=0; i<ns; ++i) {
 				values[i]=fmin+i*fstep;
 			}
 			myDet->setScanSteps(is, ns, values);
@@ -3814,7 +3814,7 @@ string slsDetectorCommand::cmdScans(int narg, char *args[], int action) {
 		char format[1000];
 		sprintf(format, "%%s %%0.%df",p);
 		sprintf(answer,"%d ",ns);
-		for (int i=0; i<ns; i++) {
+		for (int i=0; i<ns; ++i) {
 			sprintf(answer,format,answer,values[i]);
 		}
 		delete [] values;
@@ -4275,11 +4275,11 @@ string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action) {
 				return helpDetectorSize(narg,args,action);
 			ROI allroi[val];
 			pos=2;
-			for(i=0;i<val;i++){
-				if ((!sscanf(args[pos++],"%d",&allroi[i].xmin)) ||
-						(!sscanf(args[pos++],"%d",&allroi[i].xmax)) ||
-						(!sscanf(args[pos++],"%d",&allroi[i].ymin)) ||
-						(!sscanf(args[pos++],"%d",&allroi[i].ymax)) )
+			for(i=0;i<val;++i){
+				if ((!sscanf(args[++pos],"%d",&allroi[i].xmin)) ||
+						(!sscanf(args[++pos],"%d",&allroi[i].xmax)) ||
+						(!sscanf(args[++pos],"%d",&allroi[i].ymin)) ||
+						(!sscanf(args[++pos],"%d",&allroi[i].ymax)) )
 					return string("cannot parse arguments for roi");
 			}
 			myDet->setROI(val,allroi);
@@ -6515,12 +6515,12 @@ string slsDetectorCommand::cmdPattern(int narg, char *args[], int action) {
 			//int mask=1;
 			int ii=0;
 			while (ii<32) {
-				nroi++;
+				++nroi;
 				roiLimits[nroi-1].xmin=ii;
 				roiLimits[nroi-1].ymin=0;
 				roiLimits[nroi-1].ymax=0;
 				while ((addr&(1<<ii))) {
-					ii++;
+					++ii;
 					if (ii>=32)
 						break;
 				}
@@ -6532,14 +6532,14 @@ string slsDetectorCommand::cmdPattern(int narg, char *args[], int action) {
 				}
 				roiLimits[nroi-1].xmin=ii;
 				while ((addr&(1<<ii))==0) {
-					ii++;
+					++ii;
 					if (ii>=32)
 						break;
 				}
 				roiLimits[nroi-1].xmax=ii-1;
 				if (ii>=32) {
 					cout << "ROI "<< nroi << " xmin "<<roiLimits[nroi-1].xmin << " xmax "<< roiLimits[nroi-1].xmax << endl;
-					nroi++;
+					++nroi;
 					break;
 				}
 				cout << "ROI "<< nroi << " xmin "<<roiLimits[nroi-1].xmin << " xmax "<< roiLimits[nroi-1].xmax << endl;
@@ -6556,9 +6556,9 @@ string slsDetectorCommand::cmdPattern(int narg, char *args[], int action) {
 		if (nroi<1)
 			reg=0;
 		else {
-			for (int iroi=0; iroi<nroi; iroi++) {
+			for (int iroi=0; iroi<nroi; ++iroi) {
 				cout << iroi << " xmin "<< (aa+iroi)->xmin<< " xmax "<< (aa+iroi)->xmax<< endl;
-				for (int ich=(aa+iroi)->xmin; ich<=(aa+iroi)->xmax; ich++) {
+				for (int ich=(aa+iroi)->xmin; ich<=(aa+iroi)->xmax; ++ich) {
 					reg&=~(1<<ich);
 				}
 			}
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
index a097af3a6..e2b8e6838 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
@@ -163,7 +163,7 @@ int  slsDetectorUtils::acquire(int delflag){
   }
 
 
-  for(int im=0;im<nm;im++) {
+  for(int im=0;im<nm;++im) {
 
 #ifdef VERBOSE
     cout << " starting measurement "<< im << " of " << nm << endl;
@@ -184,7 +184,7 @@ int  slsDetectorUtils::acquire(int delflag){
       executeAction(startScript);
     }
 
-    for (int is0=0; is0<ns0; is0++) {
+    for (int is0=0; is0<ns0; ++is0) {
       //  cout << "scan0 loop" << endl;
 
       if (*stoppedFlag==0) {
@@ -193,7 +193,7 @@ int  slsDetectorUtils::acquire(int delflag){
 	break;
   
 
-      for (int is1=0; is1<ns1; is1++) {
+      for (int is1=0; is1<ns1; ++is1) {
 	// cout << "scan1 loop" << endl;
 
 	if (*stoppedFlag==0) {
@@ -208,7 +208,7 @@ int  slsDetectorUtils::acquire(int delflag){
 
 	ResetPositionIndex();
      
-	for (int ip=0; ip<np; ip++) {
+	for (int ip=0; ip<np; ++ip) {
 
 	  //   cout << "positions " << endl;
 	  if (*stoppedFlag==0) {