From 584e99b1b76ec8faec289fda2d16346aa9fda23a Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Thu, 15 Mar 2012 10:02:22 +0000
Subject: [PATCH] weird change added to master while merging

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@141 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetector/slsDetector.cpp               | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 8a0448476..2654dc958 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -5525,27 +5525,6 @@ masterFlags  slsDetector::setMaster(masterFlags flag) {
 	  std::cout<< "Detector returned error: " << mess << std::endl;
 	} else {
 	  controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); 
-		system("rm ~/wORKSPACE/scratch/run*  ");
-		//system("more ~/wORKSPACE/scratch/run*  ");
-		usleep(1000000);
-
-		setFileIndex(0);
-	    readAll();
-	    processData(1);
-
-
-		if(readDataFile("/home/l_maliakal_d/wORKSPACE/scratch/run_1.raw",dataVals)){
-			std::cout<< "Could not open file "<< std::endl;
-			exit(-1);
-		}
-
-		for(int j=1277;j< (thisDetector->nChans*thisDetector->nChips);j++)
-			cout<<"\t"<<j<<":"<<dataVals[j];
-
-		if(dataVals[1278]!=2558){
-			std::cout<< "DATA ERROR!! "<< std::endl;
-			exit(-1);
-		}
 	}
 	controlSocket->Disconnect();
 	if (ret==FORCE_UPDATE)