From ae4eb88553eb6c877b35089a42fedca38f4bb0e5 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Wed, 11 May 2016 11:29:27 +0200
Subject: [PATCH] status start acqisition also has detector index now, eiger
 always has detector index

---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 6 ++----
 slsDetectorSoftware/slsDetector/slsDetector.cpp           | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 7dbc6aeab..0e1579268 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3669,12 +3669,12 @@ 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(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){updateOffsets();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(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){updateOffsets();return thisMultiDetector->maxNumberOfChannel[d];};
+  int multiSlsDetector::getMaxNumberOfChannels(dimension d){return thisMultiDetector->maxNumberOfChannel[d];};
 
 
 
@@ -4624,8 +4624,6 @@ string multiSlsDetector::setFileName(string s) {
 
   for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
     if (detectors[idet]) {
-      if((getNumberOfDetectors()>1) && (setReceiverOnline()==ONLINE_FLAG))
-        setDetectorIndex(idet);
       ret1=detectors[idet]->setFileName(s);
       if(detectors[idet]->getErrorMask())
 	setErrorMask(getErrorMask()|(1<<idet));
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 31003d8a6..bf5408a0d 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6699,9 +6699,12 @@ string slsDetector::setFileName(string s) {
 	char arg[MAX_STR_LENGTH];
 	char retval[MAX_STR_LENGTH]="";
 
-
 	if(!s.empty()){
 		fileIO::setFileName(s);
+		if(thisDetector->myDetectorType == EIGER)
+			parentDet->setDetectorIndex(detId);
+		else if(parentDet->getNumberOfDetectors()>1)
+			parentDet->setDetectorIndex(detId);
 		s=parentDet->createReceiverFilePrefix();
 	}