From 47f18d3cbfa49ff533641645acaf4056da98538f Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 17 Feb 2012 11:09:51 +0000
Subject: [PATCH] adding hostname+ changing that

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@121 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsDetector/slsDetector.cpp        | 2 +-
 slsDetectorSoftware/slsDetector/slsDetector.h          | 9 +++++++++
 slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 94598af4b..22ad9d4b5 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -2772,7 +2772,7 @@ int slsDetector::updateDetectorNoWait() {
   switch(thisDetector->myDetectorType){
   case GOTTHARD:
     n = 	controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));
-    cout << "Updating detector last modified by " << lastClientIP << endl;
+    //cout << "Updating detector last modified by " << lastClientIP << endl; commented out by dhanya for now
     break;
   default:
     n = 	controlSocket->ReceiveDataOnly(lastClientIP,sizeof(lastClientIP));
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h
index d35b04444..8fb64ecbb 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.h
+++ b/slsDetectorSoftware/slsDetector/slsDetector.h
@@ -1318,6 +1318,15 @@ typedef  struct sharedSlsDetector {
   */
   int* getDataFromDetector();
 
+  /**
+      Loads dark image or gain image to the detector
+      \param index is 0 for dark image and 1 for gain image
+      \fname file name to load data from
+
+  */
+  int loadImageToDetector(int index,string const fname);
+
+
 
  protected:
  
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
index 15031a4de..7eaaba563 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
@@ -1085,7 +1085,8 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
       strcpy(hostname,"");
       for (int id=1; id<narg; id++) {
 	strcat(hostname,args[id]);
-	strcat(hostname,"+");
+	if(narg>2)
+		strcat(hostname,"+");
       } 
     }  else
       strcpy(hostname,args[1]);