Only append PHASE, REAL, etc to ImageType if term or alias not alread…

…y present (#851)

console/nii_dicom_batch.cpp

@@ -1431,15 +1431,15 @@ tse3d: T2*/
 			} else
 				isSep = true;
 		}
-		if ((d.isHasMagnitude) && ((d.manufacturer == kMANUFACTURER_GE) || ( (strstr(d.imageType, "_M_") == NULL) && (strstr(d.imageType, "_MAGNITUDE_") == NULL))))
+		if ((d.isHasMagnitude) && ((strstr(d.imageType, "_M_") == NULL) && (strstr(d.imageType, "_MAGNITUDE_") == NULL)))
 			fprintf(fp, "\", \"MAGNITUDE");
-		if ((d.isHasPhase) && ((d.manufacturer == kMANUFACTURER_GE) || (strstr(d.imageType, "_PHASE_") == NULL)))
-			fprintf(fp, "\", \"PHASE"); //"_IMAGINARY_"
-		if ((d.isHasReal) && ((d.manufacturer == kMANUFACTURER_GE) || (strstr(d.imageType, "_REAL_") == NULL)))
+		if ((d.isHasPhase) && ((strstr(d.imageType, "_P_") == NULL) && (strstr(d.imageType, "_PHASE_") == NULL)))
+			fprintf(fp, "\", \"PHASE");
+		if ((d.isHasReal) && ((strstr(d.imageType, "_R_") == NULL) && (strstr(d.imageType, "_REAL_") == NULL)))
 			fprintf(fp, "\", \"REAL");
-		if ((d.isHasImaginary) && ((d.manufacturer == kMANUFACTURER_GE) || (strstr(d.imageType, "_IMAGINARY_") == NULL)))
+		if ((d.isHasImaginary) && ((strstr(d.imageType, "_I_") == NULL) && (strstr(d.imageType, "_IMAGINARY_") == NULL)))
 			fprintf(fp, "\", \"IMAGINARY");
-		if ((d.isRealIsPhaseMapHz)) // && ((d.manufacturer == kMANUFACTURER_GE) || (strstr(d.imageType, "_IMAGINARY_") == NULL)) )
+		if ((d.isRealIsPhaseMapHz)  && ((strstr(d.imageType, "_FIELDMAPHZ_") == NULL)))
 			fprintf(fp, "\", \"FIELDMAPHZ");
 		fprintf(fp, "\"],\n");
 	}