From 412ae983859f9cb0c682f5c7c7711445abab0d84 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 30 Apr 2024 18:43:36 -0400 Subject: [PATCH] BUG: Do not adjust Phase values in CTF Files Signed-off-by: Michael Jackson --- .../OrientationAnalysisFilters/ReadCtfData.cpp | 17 ----------------- Website/docs/Latest_Release_Notes.md | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp index 10719ed2ea..0d6cad428b 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp @@ -515,24 +515,7 @@ void ReadCtfData::copyRawEbsdData(CtfReader* reader, std::vector& tDims, tDims[2] = m->getGeometryAs()->getZPoints(); ebsdAttrMat->resizeAttributeArrays(tDims); { - /* Take from H5CtfVolumeReader.cpp - * For HKL OIM Files if there is a single phase then the value of the phase - * data is one (1). If there are 2 or more phases then the lowest value - * of phase is also one (1). However, if there are "zero solutions" in the data - * then those points are assigned a phase of zero. Since those points can be identified - * by other methods, the phase of these points should be changed to one since in the rest - * of the reconstruction code we follow the convention that the lowest value is One (1) - * even if there is only a single phase. The next if statement converts all zeros to ones - * if there is a single phase in the OIM data. - */ phasePtr = reinterpret_cast(reader->getPointerByName(EbsdLib::Ctf::Phase)); - for(size_t i = 0; i < totalPoints; i++) - { - if(phasePtr[i] < 1) - { - phasePtr[i] = 1; - } - } iArray = Int32ArrayType::CreateArray(totalPoints, SIMPL::CellData::Phases, true); ::memcpy(iArray->getPointer(0), phasePtr, sizeof(int32_t) * totalPoints); ebsdAttrMat->insertOrAssign(iArray); diff --git a/Website/docs/Latest_Release_Notes.md b/Website/docs/Latest_Release_Notes.md index 3d99c79d9b..24a18f82f0 100644 --- a/Website/docs/Latest_Release_Notes.md +++ b/Website/docs/Latest_Release_Notes.md @@ -7,6 +7,7 @@ hide: ## Known Issues ## - Match Crystallography: The Average Quaternions that are generated may not be correct. As a work around, use the "Delete Data" filter to remove the FeatureData / Average Quaternions and then regenerate them by using the "Convert Orientation Representation" filter to convert the Average Euler Angles to Quaternions. +- Read Oxford Instruments CTF File: There is an issue where the phase data values will be incremented from 0 to 1 under certain conditions. The workaround is to first convert the data to an H5EBSD file, then read the data from the H5EBSD file in DREAM.3D. ## Version 6.5.171 Release Notes ##