From c18b61aabdc52027d303b357f16c8ba8771d4b83 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Thu, 28 Feb 2013 19:39:02 +0000
Subject: [PATCH] refs #6543 Disable OMP

---
 .../DataHandling/src/LoadDetectorInfo.cpp      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadDetectorInfo.cpp b/Code/Mantid/Framework/DataHandling/src/LoadDetectorInfo.cpp
index 08a8786d0009..fb8ce3f8bc2a 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadDetectorInfo.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadDetectorInfo.cpp
@@ -848,10 +848,10 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
 
   bool noneSet = true;
   size_t detectorProblemCount(0);
-  PRAGMA(omp parallel for reduction(|| : differentOffsets)) 
+  //PRAGMA(omp parallel for reduction(|| : differentOffsets)) 
   for(int i=0;i<int(nDetectors);i++)
   {
-    PARALLEL_START_INTERUPT_REGION
+    //PARALLEL_START_INTERUPT_REGION
 
     // check we have a supported code
     switch (detType[i])
@@ -862,7 +862,7 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
 
     // the following detectors codes specify little or no analysis
     case MONITOR_DEVICE :
-      PARALLEL_CRITICAL(different_mon_offset)
+      //PARALLEL_CRITICAL(different_mon_offset)
       {
         // throws invalid_argument if the detection delay time is different for different monitors
         noteMonitorOffset(detOffset[i], detStruct[i].detID);
@@ -875,7 +875,7 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
 
     //we can't use data for detectors with other codes because we don't know the format, ignore the data and write to g_log.warning() once at the end
     default :
-      PARALLEL_CRITICAL(problem_detector)
+      //PARALLEL_CRITICAL(problem_detector)
       {
         detectorProblemCount ++;
         g_log.debug() << "Ignoring data for a detector with code " << detType[i] << std::endl;
@@ -890,7 +890,7 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
     {// could mean different detectors have different offsets and we need to do things thoroughly
       if ( detectorOffset ==  UNSETOFFSET ) 
       {
-        PARALLEL_CRITICAL(det_offset)
+        //PARALLEL_CRITICAL(det_offset)
         {
           if(detectorOffset ==  UNSETOFFSET) detectorOffset = detOffset[i];
           if(detOffset[i] != detectorOffset) differentOffsets=true;
@@ -912,7 +912,7 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
       }
       catch (Exception::NotFoundError &)
       {// there are likely to be some detectors that we can't find in the instrument definition and we can't save parameters for these. We can't do anything about this just report the problem at the end
-        PARALLEL_CRITICAL(non_existing_detector)
+        //PARALLEL_CRITICAL(non_existing_detector)
         {
           missingDetectors.push_back(detStruct[i].detID);
         }
@@ -926,7 +926,7 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
 
     if ( i % 100 == 0 )
     {	
-        PARALLEL_CRITICAL(logging)
+        //PARALLEL_CRITICAL(logging)
         {
             log = detStruct[i];
             sometimesLogSuccess(log, noneSet);
@@ -936,9 +936,9 @@ void LoadDetectorInfo::readNXS(const std::string& fName)
     }
     
     }
-    PARALLEL_END_INTERUPT_REGION
+    //PARALLEL_END_INTERUPT_REGION
   }
-  PARALLEL_CHECK_INTERUPT_REGION
+  //PARALLEL_CHECK_INTERUPT_REGION
 
   sometimesLogSuccess(log, noneSet = true);
   g_log.notice() << "Adjusting time of flight X-values by detector delay times, detector have the different offsets:  "<< differentOffsets << std::endl;