WIP: UNassoc channels

AllenInstitute · May 31, 2019 · d38452e · d38452e
1 parent 3f844a0
commit d38452e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Packages/MIES/MIES_NeuroDataWithoutBorders.ipf b/Packages/MIES/MIES_NeuroDataWithoutBorders.ipf
@@ -910,7 +910,11 @@ static Function NWB_AppendSweepLowLevel(locationID, nwbVersion, panelTitle, ITCD
 
 		switch(params.channelType)
 			case ITC_XOP_CHANNEL_TYPE_ADC:
-				path = "/acquisition/timeseries"
+				if(nwbVersion == 1)
+					path = "/acquisition/timeseries"
+				elseif(nwbVersion == 2)
+					path = "/acquisition"
+				endif
 				break
 			case ITC_XOP_CHANNEL_TYPE_DAC:
 				path = "/stimulus/presentation"

diff --git a/Packages/Testing-MIES/UTF_TestNWBExportV2.ipf b/Packages/Testing-MIES/UTF_TestNWBExportV2.ipf
@@ -242,7 +242,7 @@ static Function TestTimeSeries(fileID, device, groupID, channel, sweep, pxpSweep
 	DFREF pxpSweepsDFR
 
 	variable channelGroupID, num_samples, starting_time, session_start_time, actual, scale, scale_ref
-	variable clampMode, gain, gain_ref, resolution, conversion
+	variable clampMode, gain, gain_ref, resolution, conversion, headstage
 	string stimulus, stimulus_expected, channelName, str, path
 	string electrode_name, electrode_name_ref, key, unit_ref, unit, base_unit_ref
 
@@ -254,8 +254,13 @@ static Function TestTimeSeries(fileID, device, groupID, channel, sweep, pxpSweep
 
 	// @TODO FIXME HACKY
 	string headstageDesc = IPNWB#ReadTextDataSetAsString(channelGroupID, "electrode/description")
-	variable headstage = str2num(RemovePrefix(headstageDesc, startStr="Headstage "))
-	CHECK(headstage >= 0 && headstage < NUM_HEADSTAGES)
+	if(!cmpstr(headstageDesc, "PLACEHOLDER"))
+		headstage = NaN
+	else
+		headstage = str2num(RemovePrefix(headstageDesc, startStr="Headstage "))
+		CHECK(headstage >= 0 && headstage < NUM_HEADSTAGES)
+	endif
+
 	params.electrodeNumber = headstage
 
 	channelName = GetChannelNameFromChannelType(groupID, device, channel, sweep, params)