From 5f78b4534f7c84909fd4a44ede27b445eaf4dc50 Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Mon, 17 Sep 2012 15:31:20 +0000
Subject: [PATCH] angular conversion data ready callback working also with 0
 positions, and multislsdetector write data file fixed

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@256 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp  | 4 ++--
 slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 1bca22309..003f4ea25 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3416,10 +3416,10 @@ int multiSlsDetector::writeDataFile(string fname, double *data, double *err, dou
        off+=n;
     
        if (pe)
-	 pe=pe+off;
+	 pe=err+off;
        
        if (pa)
-	 pa=pa+off;
+	 pa=ang+off;
      
      }
      
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index 2f91b98ba..48482dd03 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -184,7 +184,8 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
       writeDataFile (fname+ext,  ffcdata, ffcerr,ang);
     }
    
-    if (*correctionMask&(1<< ANGULAR_CONVERSION) && getNumberOfPositions()>0) {
+    //   if (*correctionMask&(1<< ANGULAR_CONVERSION) && getNumberOfPositions()>0) {
+    if (*correctionMask&(1<< ANGULAR_CONVERSION)) {
 #ifdef VERBOSE
       cout << "**************Current position index is " << getCurrentPositionIndex() << endl;
 #endif