From af864279a5d7eba3f618fbf1daa1bbc4b9e62a1a Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 16 Mar 2012 13:06:28 +0000
Subject: [PATCH] added loadimage function

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@147 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../multiSlsDetector/multiSlsDetector.cpp     | 42 +++++++++++++++++--
 .../multiSlsDetector/multiSlsDetector.h       |  5 +--
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 8c66a2b14..0c5a5e80f 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -236,7 +236,6 @@ multiSlsDetector::multiSlsDetector(int id) :  slsDetectorUtils(), shmId(-1)
 // #ifdef VERBOSE
 //    cout << "done" << endl;
 // #endif 
-
 }
 
 multiSlsDetector::~multiSlsDetector() {
@@ -1022,6 +1021,7 @@ int* multiSlsDetector::getDataFromDetector() {
 };
 
 
+
 int* multiSlsDetector::readFrame(){
   int nel=thisMultiDetector->dataBytes/sizeof(int);
   int n;
@@ -2500,6 +2500,44 @@ int multiSlsDetector::configureMAC() {
 }
 
 
+
+int multiSlsDetector::loadImageToDetector(imageType index,string const fname){
+
+	int ret=-100, ret1;
+	short int arg[thisMultiDetector->numberOfChannels];
+
+	ifstream infile;
+	infile.open(fname.c_str(), ios_base::in);
+	if (infile.is_open()) {
+#ifdef VERBOSE
+		std::cout<< std::endl<< "Loading ";
+		if(!index)
+			std::cout<<"Dark";
+		else
+			std::cout<<"Gain";
+		std::cout<<" image from file " << fname << std::endl;
+#endif
+		for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
+			if (detectors[idet]) {
+				if(detectors[idet]->readDataFile(infile,arg)>=0){
+					ret1=detectors[idet]->sendImageToDetector(index,arg);
+					if (ret==-100)
+						ret=ret1;
+					else if (ret!=ret1)
+						ret=-1;
+				}
+			}
+		}
+		infile.close();
+	} else {
+		std::cout<< "Could not open file "<< fname << std::endl;
+		return -1;
+	}
+	return ret;
+}
+
+
+
 int multiSlsDetector::setDynamicRange(int p) {
 
   int ret=-100, ret1;
@@ -3180,10 +3218,8 @@ int multiSlsDetector::retrieveDetectorSetup(string const fname1, int level){
 
 
 
-int multiSlsDetector::loadImageToDetector(imageType t, string s) {
   return OK;
 
-}
 int multiSlsDetector::testFunction(int times) {
   return OK;
 }
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 6636461bc..5ceb8d677 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -493,7 +493,7 @@ class multiSlsDetector  : public slsDetectorUtils {
     \returns pointer to the data or NULL. If NULL disconnects the socket
     \sa getDataFromDetector
   */ 
-  int* getDataFromDetector(); 
+  int* getDataFromDetector();
 
   /**
    asks and  receives a data frame from the detector and puts it in the data queue
@@ -853,9 +853,6 @@ class multiSlsDetector  : public slsDetectorUtils {
 
   int configureMAC();
 
-
-
-
   int setNumberOfModules(int i=-1, dimension d=X);
   int getMaxNumberOfModules(dimension d=X);
   int setDynamicRange(int i=-1);