Merge pull request #741 from rordenlab/3db0map

3db0map
rordenlab · Aug 12, 2023 · c33c975 · c33c975
2 parents f5b6f9e + f7c3e3f
commit c33c975
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/console/nii_dicom.cpp b/console/nii_dicom.cpp
@@ -5911,7 +5911,7 @@ const uint32_t kEffectiveTE = 0x0018 + uint32_t(0x9082 << 16); //FD
 			} else if (strstr( d.pulseSequenceName, "epi") != NULL) {
 				d.epiVersionGE = kGE_EPI_EPI; //-1 = not epi, 0 = epi, 1 = epiRT
 			}
-			if (strcmp( d.pulseSequenceName, "3db0map") == 0) {
+			if (strstr( d.pulseSequenceName, "b0map")) {
 				isGEfieldMap = true; //issue501
 			}
 			break;
@@ -7993,8 +7993,6 @@ const uint32_t kEffectiveTE = 0x0018 + uint32_t(0x9082 << 16); //FD
 	//avoid false positives: non-EPI GE scans can report b-value = 0
 	if ((d.isDiffusion) && (d.manufacturer == kMANUFACTURER_GE))
 		d.isDiffusion = ((d.internalepiVersionGE == kGE_EPI_EPI2) || (d.epiVersionGE == kGE_EPI_EPI2));
-	if ((d.manufacturer == kMANUFACTURER_GE) && (strstr( d.pulseSequenceName, "3db0map")) && strstr(d.imageType, "OTHER"))
-		d.isRealIsPhaseMapHz = true;
 	//detect pepolar https://github.com/nipy/heudiconv/issues/479
 	if ((d.epiVersionGE == kGE_EPI_PEPOLAR_FWD) && (userData12GE == 1))
 		d.epiVersionGE = kGE_EPI_PEPOLAR_REV;

diff --git a/console/nii_dicom_batch.cpp b/console/nii_dicom_batch.cpp
@@ -6873,16 +6873,13 @@ void setBidsGE(struct TDICOMdata *d, int nConvert, int isVerbose, const char *fi
 		strcpy(dataTypeBIDS, "discard");
 		strcpy(modalityBIDS, "localizer");
 		isReportEcho = false;
-	} else if (d->isRealIsPhaseMapHz) {
-		isReportEcho = false;
-		//isAddSeriesToRun = false;
-		strcpy(dataTypeBIDS, "fmap");
-		strcpy(modalityBIDS, "fieldmap");
-	} else if (strstr( d->pulseSequenceName, "3db0map")) {
+	} else if ((d->isRealIsPhaseMapHz) || (strstr(seqName, "B0map")) || (strstr( d->pulseSequenceName, "3db0map"))) {
+		//case sensitivity: B0Map vs 3db0map
 		isReportEcho = false;
+		isAddSeriesToRun = false;
 		strcpy(dataTypeBIDS, "fmap");
 		strcpy(modalityBIDS, "magnitude");
-		if (strstr( d->imageType, "OTHER")) //NOT magnitude
+		if (d->isRealIsPhaseMapHz)
 			strcpy(modalityBIDS, "fieldmap");
 	} else if ((d->isMultiEcho) && (!isEPGR) && (isGR)) {
 		//detect EFGRE3D "STAGE 24" sequence, see 7T 29.1 example