Merge pull request #38841 from mantidproject/revert-38818-ewm9174-scrap-nappy-ornl-next

Revert "Remove napi from NexusClasses - ornl-next"

Author: rboston628

Framework/API/src/FrameworkManager.cpp

@@ -340,7 +340,7 @@ void FrameworkManagerImpl::setGlobalNumericLocaleToC() {
 }
 
 /// Silence NeXus output
-void FrameworkManagerImpl::disableNexusOutput() { ::NeXus::setError(nullptr, NexusErrorFunction); }
+void FrameworkManagerImpl::disableNexusOutput() { NXMSetError(nullptr, NexusErrorFunction); }
 
 /// Starts asynchronous tasks that are done as part of Start-up.
 void FrameworkManagerImpl::asynchronousStartupTasks() {

Framework/DataHandling/src/LoadEventNexus.cpp

@@ -60,6 +60,9 @@ using namespace DataObjects;
 using Types::Core::DateAndTime;
 
 namespace {
+// detnotes the end of iteration for NeXus::getNextEntry
+const std::string NULL_STR("NULL");
+
 const std::vector<std::string> binningModeNames{"Default", "Linear", "Logarithmic"};
 enum class BinningMode { DEFAULT, LINEAR, LOGARITHMIC, enum_count };
 typedef Mantid::Kernel::EnumeratedString<BinningMode, &binningModeNames> BINMODE;
@@ -345,7 +348,7 @@ void LoadEventNexus::setTopEntryName() {
           m_top_entry_name = entry.first;
           break;
         }
-      } else if (entry == ::NeXus::EOD_ENTRY) {
+      } else if (entry.first == NULL_STR && entry.second == NULL_STR) {
         g_log.error() << "Unable to determine name of top level NXentry - assuming "
                          "\"entry\".\n";
         m_top_entry_name = "entry";

Framework/DataHandling/src/LoadHelper.cpp

@@ -497,7 +497,7 @@ void LoadHelper::fillMovingWorkspace(const API::MatrixWorkspace_sptr &ws, const
   const auto useCustomSpectraMap = customDetectorIDs.size() != 0;
   const auto useAcceptedDetectorIDs = acceptedDetectorIDs.size() != 0;
 
-  std::array<int, 3U> dims = {data.dim0(), data.dim1(), data.dim2()};
+  std::array dims = {data.dim0(), data.dim1(), data.dim2()};
   const auto nTubes = dims[std::get<0>(axisOrder)];
   const auto nPixels = dims[std::get<1>(axisOrder)];
   const auto nScans = dims[std::get<2>(axisOrder)];

Framework/DataHandling/src/LoadNexus.cpp

@@ -37,6 +37,10 @@ using namespace Kernel;
 using namespace API;
 using namespace DataObjects;
 
+namespace {
+const std::string NULL_STR("NULL");
+}
+
 /// Empty default constructor
 LoadNexus::LoadNexus() : Algorithm(), m_filename() {}
 
@@ -293,7 +297,7 @@ int LoadNexus::getNexusEntryTypes(const std::string &fileName, std::vector<std::
   std::pair<std::string, std::string> entry;
   while (true) {
     entry = fileH->getNextEntry();
-    if (entry == ::NeXus::EOD_ENTRY)
+    if (entry.first == NULL_STR && entry.second == NULL_STR)
       break;
 
     if (entry.second == "NXentry")
@@ -308,7 +312,7 @@ int LoadNexus::getNexusEntryTypes(const std::string &fileName, std::vector<std::
     // loop through field names in this entry
     while (true) {
       entry = fileH->getNextEntry();
-      if (entry == ::NeXus::EOD_ENTRY)
+      if (entry.first == NULL_STR && entry.second == NULL_STR)
         break;
       // if a data field
       if (entry.second == "SDS") {

Framework/DataHandling/src/LoadNexusProcessed.cpp

@@ -845,10 +845,10 @@ API::Workspace_sptr LoadNexusProcessed::loadTableEntry(const NXEntry &entry) {
         std::string columnTitle = data.attributes("name");
         if (!columnTitle.empty()) {
           workspace->addColumn("str", columnTitle);
-          NeXus::DimSize nRows = info.dims[0];
+          int nRows = info.dims[0];
           workspace->setRowCount(nRows);
 
-          NeXus::DimSize const maxStr = info.dims[1];
+          const int maxStr = info.dims[1];
           data.load();
           for (int iR = 0; iR < nRows; ++iR) {
             auto &cellContents = workspace->cell<std::string>(iR, columnNumber - 1);
@@ -1173,7 +1173,7 @@ API::Workspace_sptr LoadNexusProcessed::loadLeanElasticPeaksEntry(const NXEntry
       NXInfo info = nx_tw.getDataSetInfo(str);
       NXChar data = nx_tw.openNXChar(str);
 
-      const int maxShapeJSONLength = static_cast<int>(info.dims[1]);
+      const int maxShapeJSONLength = info.dims[1];
       data.load();
       for (int i = 0; i < numberPeaks; ++i) {
 
@@ -1465,7 +1465,7 @@ API::Workspace_sptr LoadNexusProcessed::loadPeaksEntry(const NXEntry &entry) {
       NXInfo info = nx_tw.getDataSetInfo(str);
       NXChar data = nx_tw.openNXChar(str);
 
-      NeXus::DimSize const maxShapeJSONLength = info.dims[1];
+      const int maxShapeJSONLength = info.dims[1];
       data.load();
       for (int i = 0; i < numberPeaks; ++i) {
 

Framework/DataHandling/src/LoadTOFRawNexus.cpp

@@ -187,7 +187,7 @@ void LoadTOFRawNexus::countPixels(const std::string &nexusfilename, const std::s
 
           // Count how many pixels in the bank
           file.openData("pixel_id");
-          std::vector<int64_t> const dims = file.getInfo().dims;
+          std::vector<int64_t> dims = file.getInfo().dims;
           file.closeData();
 
           if (!dims.empty()) {
@@ -200,11 +200,11 @@ void LoadTOFRawNexus::countPixels(const std::string &nexusfilename, const std::s
 
           // Get the number of pixels from the offsets arrays
           file.openData("x_pixel_offset");
-          std::vector<int64_t> const xdim = file.getInfo().dims;
+          std::vector<int64_t> xdim = file.getInfo().dims;
           file.closeData();
 
           file.openData("y_pixel_offset");
-          std::vector<int64_t> const ydim = file.getInfo().dims;
+          std::vector<int64_t> ydim = file.getInfo().dims;
           file.closeData();
 
           if (!xdim.empty() && !ydim.empty()) {
@@ -215,7 +215,7 @@ void LoadTOFRawNexus::countPixels(const std::string &nexusfilename, const std::s
         if (bankEntries.find(m_axisField) != bankEntries.end()) {
           // Get the size of the X vector
           file.openData(m_axisField);
-          std::vector<int64_t> const dims = file.getInfo().dims;
+          std::vector<int64_t> dims = file.getInfo().dims;
           // Find the units, if available
           if (file.hasAttr("units"))
             file.getAttr("units", m_xUnits);

Framework/DataHandling/src/NexusTester.cpp

@@ -146,7 +146,7 @@ void NexusTester::exec() {
   if (!LoadFilename.empty()) {
     ::NeXus::File file(LoadFilename, NXACC_READ);
     int HDFCacheSize = getProperty("HDFCacheSize");
-    ::NeXus::setCache(HDFCacheSize);
+    NXsetcache(HDFCacheSize);
     file.openGroup("FakeDataGroup", "NXdata");
     Progress prog(this, 0.0, 1.0, NumChunks);
     CPUTimer tim;

Framework/DataHandling/src/SaveNexusProcessed.cpp

@@ -205,7 +205,7 @@ void SaveNexusProcessed::doExec(const Workspace_sptr &inputWorkspace,
                                 std::shared_ptr<Mantid::NeXus::NexusFileIO> &nexusFile, const bool keepFile,
                                 optional_size_t entryNumber) {
   // TODO: Remove?
-  ::NeXus::EnableErrorReporting();
+  NXMEnableErrorReporting();
 
   // Retrieve the filename from the properties
   const std::string filename = getPropertyValue("Filename");