Handle Siemens data where protocolName (0018,1030) is empty https://w…

…ww.nitrc.org/forum/forum.php?thread_id=8771&forum_id=4703
rordenlab · Dec 4, 2017 · 94f3129 · 94f3129
1 parent 02fc4b2
commit 94f3129
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/console/nii_dicom.cpp b/console/nii_dicom.cpp
@@ -3767,8 +3767,8 @@ uint32_t kUnnest2 = 0xFFFE +(0xE0DD << 16 ); //#define  kUnnest2 0xFFFE +(0xE0DD
 		strcpy(d.protocolName, d.seriesDescription);
     if ((strlen(d.protocolName) < 1) && (strlen(d.seriesDescription) > 1))
 		strcpy(d.protocolName, d.seriesDescription);
-    if ((strlen(d.protocolName) < 1) && (strlen(d.sequenceName) > 1))
-		strcpy(d.protocolName, d.sequenceName);
+    if ((strlen(d.protocolName) < 1) && (strlen(d.sequenceName) > 1) && (d.manufacturer != kMANUFACTURER_SIEMENS))
+		strcpy(d.protocolName, d.sequenceName); //protocolName (0018,1030) optional, sequence name (0018,0024) is not a good substitute for Siemens as it can vary per volume: *ep_b0 *ep_b1000#1, *ep_b1000#2, etc https://www.nitrc.org/forum/forum.php?thread_id=8771&forum_id=4703
 	//     if (!isOrient) {
 	//     	if (d.isNonImage)
 	//     		printWarning("Spatial orientation ambiguous  (tag 0020,0037 not found) [probably not important: derived image]: %s\n", fname);

diff --git a/console/nii_dicom.h b/console/nii_dicom.h
@@ -38,7 +38,7 @@ extern "C" {
 	#define kCCsuf " CompilerNA" //unknown compiler!
 #endif
 
-#define kDCMvers "v1.0.20171122" kDCMsuf kCCsuf
+#define kDCMvers "v1.0.20171204" kDCMsuf kCCsuf
 
 static const int kMaxEPI3D = 1024; //maximum number of EPI images in Siemens Mosaic
 static const int kMaxDTI4D = 4096; //maximum number of DTI directions for 4D (Philips) images, also maximum number of 3D slices for Philips 3D and 4D images

diff --git a/console/nii_dicom_batch.cpp b/console/nii_dicom_batch.cpp
@@ -2584,7 +2584,7 @@ int isSameFloatDouble (double a, double b) {
 }
 
 struct TWarnings { //generate a warning only once per set
-        bool acqNumVaries, bitDepthVaries, dateTimeVaries, echoVaries, coilVaries, nameVaries, orientVaries;
+        bool acqNumVaries, bitDepthVaries, dateTimeVaries, echoVaries, coilVaries, nameVaries, nameEmpty, orientVaries;
 };
 
 TWarnings setWarnings() {
@@ -2595,6 +2595,7 @@ TWarnings setWarnings() {
 	r.echoVaries = false;
 	r.coilVaries = false;
 	r.nameVaries = false;
+	r.nameEmpty = false;
 	r.orientVaries = false;
 	return r;
 }
@@ -2649,9 +2650,13 @@ bool isSameSet (struct TDICOMdata d1, struct TDICOMdata d2, struct TDCMopts* opt
         warnings->coilVaries = true;
         return false;
     }
-    if ((strcmp(d1.protocolName, d2.protocolName) != 0)) {
-        if ((!warnings->nameVaries))
-        	printMessage("slices not stacked: protocol name varies\n");
+    if ((strlen(d1.protocolName) < 1) && (strlen(d2.protocolName) < 1)) {
+    	if (!warnings->nameEmpty)
+    	printWarning("Empty protocol name(s) (0018,1030)\n");
+    	warnings->nameEmpty = true;
+    } else if ((strcmp(d1.protocolName, d2.protocolName) != 0)) {
+        if (!warnings->nameVaries)
+        	printMessage("slices not stacked: protocol name varies '%s' != '%s'\n", d1.protocolName, d2.protocolName);
         warnings->nameVaries = true;
         return false;
     }