Merge pull request #1184 from AllenInstitute/bugfix/1119-analysis-functions

Various Analysis Functions Dashboard fixes

Author: t-b

Packages/MIES/MIES_AnalysisFunctions_Dashboard.ipf

@@ -68,20 +68,19 @@ Function AD_Update(win)
 		selWave[][][%foreColors] = AD_GetColorForResultMessage(listWave[p][%Result])
 
 		helpWave[] = "Result:\r" + listWave[p][%Result]
-
-		EnableControls(mainPanel, "check_BrowserSettings_DB_Failed;check_BrowserSettings_DB_Passed")
 	else
 		SetNumberInWaveNote(listWave, NOTE_INDEX, 0)
-		DisableControls(mainPanel, "check_BrowserSettings_DB_Failed;check_BrowserSettings_DB_Passed")
 	endif
 
 	DEBUGPRINT_ELAPSED(refTime)
 End
 
-static Function/S AD_GetResultMessage(variable anaFuncType, variable passed, WAVE numericalValues, WAVE/T textualValues, variable sweepNo, variable headstage)
+static Function/S AD_GetResultMessage(variable anaFuncType, variable passed, WAVE numericalValues, WAVE/T textualValues, variable sweepNo, variable headstage, variable ongoingDAQ)
 
 	if(passed)
 		return "Pass"
+	elseif(ongoingDAQ)
+		return "Sweep not yet finished"
 	endif
 
 	// MSQ_DA
@@ -149,7 +148,7 @@ static Function AD_FillWaves(win, list, info)
 	string win
 	WAVE/T list, info
 
-	variable i, j, headstage, passed, sweepNo, numEntries
+	variable i, j, headstage, passed, sweepNo, numEntries, ongoingDAQ
 	variable index, anaFuncType, stimsetCycleID, firstValid, lastValid
 	string key, anaFunc, stimset, msg
 
@@ -209,26 +208,32 @@ static Function AD_FillWaves(win, list, info)
 			stimsetCycleID = stimsetCycleIDs[headstage]
 
 			FindValue/RMD=[][0]/TXOP=4/TEXT=AD_FormatListKey(stimsetCycleID, headstage) info
-			if(V_Value >= 0) // already included
-				continue
+			if(V_Value >= 0)
+				if(!cmpstr(info[V_Value][%$"Ongoing DAQ"], "1"))
+					// if DAQ was ongoing we want to overwrite this entry and all later entries
+					index = V_Value
+					info[index, inf][] = ""
+				else
+					// otherwise we want to keep it
+					continue
+				endif
 			endif
 
 			WAVE/Z/T stimsets = GetLastSetting(textualValues, sweepNo, STIM_WAVE_NAME_KEY, DATA_ACQUISITION_MODE)
 			ASSERT(WaveExists(stimsets), "No stimsets found")
 
 			stimset = stimsets[headstage]
 
-			if(anaFuncType != INVALID_ANALYSIS_FUNCTION)
+			if(anaFuncType == INVALID_ANALYSIS_FUNCTION)
+				passed = NaN
+				ongoingDAQ = 0
+			else
 				key = CreateAnaFuncLBNKey(anaFuncType, PSQ_FMT_LBN_SET_PASS, query = 1)
 				passed = GetLastSettingIndepSCI(numericalValues, sweepNo, key, headstage, UNKNOWN_MODE)
-
-				if(isNaN(passed))
-					// the set is not yet finished
-					continue
-				endif
+				ongoingDAQ = IsNaN(passed)
 			endif
 
-			msg = AD_GetResultMessage(anaFuncType, passed, numericalValues, textualValues, sweepNo, headstage)
+			msg = AD_GetResultMessage(anaFuncType, passed, numericalValues, textualValues, sweepNo, headstage, ongoingDAQ)
 
 			EnsureLargeEnoughWave(list, dimension = ROWS, minimumSize = index)
 			EnsureLargeEnoughWave(info, dimension = ROWS, minimumSize = index)
@@ -254,8 +259,14 @@ static Function AD_FillWaves(win, list, info)
 				case MSQ_FAST_RHEO_EST:
 				case SC_SPIKE_CONTROL:
 					key = CreateAnaFuncLBNKey(anaFuncType, PSQ_FMT_LBN_SWEEP_PASS, query = 1)
-					WAVE sweepPass = GetLastSettingIndepEachSCI(numericalValues, sweepNo, key, headstage, UNKNOWN_MODE)
-					ASSERT(DimSize(sweeps, ROWS) == DimSize(sweepPass, ROWS), "Unexpected wave sizes")
+					WAVE/Z sweepPass = GetLastSettingIndepEachSCI(numericalValues, sweepNo, key, headstage, UNKNOWN_MODE, defValue = 0)
+
+					if(!WaveExists(sweepPass))
+						Duplicate/FREE sweeps, sweepPass
+						sweepPass = 0
+					else
+						ASSERT(DimSize(sweeps, ROWS) == DimSize(sweepPass, ROWS), "Unexpected wave sizes")
+					endif
 
 					Duplicate/FREE sweeps, passingSweepsAll, failingSweepsAll
 					passingSweepsAll[] = sweepPass[p]  ? sweeps[p] : NaN
@@ -294,6 +305,7 @@ static Function AD_FillWaves(win, list, info)
 			info[index][%$STIMSET_ACQ_CYCLE_ID_KEY] = AD_FormatListKey(stimsetCycleID, headstage)
 			info[index][%$"Passing Sweeps"] = NumericWaveToList(passingSweeps, ";")
 			info[index][%$"Failing Sweeps"] = NumericWaveToList(failingSweeps, ";")
+			info[index][%$"Ongoing DAQ"] = num2str(ongoingDAQ)
 
 			SetNumberInWaveNote(list, NOTE_INDEX, ++index)
 		endfor
@@ -543,7 +555,10 @@ static Function/S AD_GetBaselineFailMsg(anaFuncType, numericalValues, sweepNo, h
 				return ""
 			endif
 
-			ASSERT(WaveExists(baselineQC), "Missing baseline QC LBN entry")
+			if(!WaveExists(baselineQC))
+				BUG("Missing baseline QC LBN entry")
+				return ""
+			endif
 
 			if(!baselineQC[headstage])
 				for(i = 0; ;i += 1)
@@ -839,9 +854,19 @@ End
 Function AD_CheckProc_Toggle(cba) : CheckBoxControl
 	STRUCT WMCheckboxAction &cba
 
+	string win
+
 	switch(cba.eventCode)
 		case 2: // mouse up
-			AD_Update(cba.win)
+			win = cba.win
+			AD_Update(win)
+
+			if(cba.checked)
+				EnableControls(win, "check_BrowserSettings_DB_Failed;check_BrowserSettings_DB_Passed")
+			else
+				DisableControls(win, "check_BrowserSettings_DB_Failed;check_BrowserSettings_DB_Passed")
+			endif
+
 			break
 	endswitch
 

Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf

@@ -732,7 +732,7 @@ Function PSQ_NumPassesInSet(numericalValues, type, sweepNo, headstage)
 
 	Make/FREE/N=(DimSize(sweeps, ROWS)) passes
 	key = CreateAnaFuncLBNKey(type, PSQ_FMT_LBN_SWEEP_PASS, query = 1)
-	passes[] = GetLastSettingIndep(numericalValues, sweeps[p], key, UNKNOWN_MODE)
+	passes[] = GetLastSettingIndep(numericalValues, sweeps[p], key, UNKNOWN_MODE, defValue = 0)
 
 	return sum(passes)
 End
@@ -3071,7 +3071,7 @@ Function [variable result, variable maxOccurences] PSQ_CR_SetHasPassed(WAVE nume
 	return [0, maxValue]
 End
 
-/// @brief Returns the two letter states "AA", "AB" and "BA" for the value and
+/// @brief Returns the two letter states "AA", "BB" and "BA" for the value and
 /// the scaling factors to reach min/center/max
 ///
 /// We need the real baseline value (measured), whereas

Packages/MIES/MIES_Constants.ipf

@@ -627,7 +627,7 @@ Constant HARDWARE_DAC_EXTERNAL_TRIGGER = 0x1
 
 /// Used to upgrade the GuiStateWave as well as the DA Ephys panel
 Constant DA_EPHYS_PANEL_VERSION           = 55
-Constant DATA_SWEEP_BROWSER_PANEL_VERSION = 33
+Constant DATA_SWEEP_BROWSER_PANEL_VERSION = 34
 Constant WAVEBUILDER_PANEL_VERSION        = 11
 Constant ANALYSISBROWSER_PANEL_VERSION    =  1
 

Packages/MIES/MIES_DataBrowser.ipf

@@ -212,8 +212,9 @@ Function DB_ResetAndStoreCurrentDBPanel()
 	SetVariable setvar_Display_EqualYlevel WIN = $bsPanel, value= _NUM:0
 	Slider slider_BrowserSettings_dDAQ WIN = $bsPanel, value= -1,disable=DISABLE_CONTROL_BIT
 	CheckBox check_SweepControl_HideSweep WIN = $bsPanel, value= 0
-	CheckBox check_BrowserSettings_DB_Passed WIN = $bsPanel, value= 0
-	CheckBox check_BrowserSettings_DB_Failed WIN = $bsPanel, value= 0
+	CheckBox check_BrowserSettings_DS WIN = $bsPanel, value= 0
+	CheckBox check_BrowserSettings_DB_Passed WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT | HIDDEN_CONTROL_BIT
+	CheckBox check_BrowserSettings_DB_Failed WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT | HIDDEN_CONTROL_BIT
 	CheckBox check_BrowserSettings_SF WIN = $bsPanel, value= 0
 
 	CheckBox check_BrowserSettings_VisEpochs WIN = $bsPanel, value=0, disable=0

Packages/MIES/MIES_DataBrowser_Macro.ipf

@@ -11,7 +11,7 @@
 
 Window DataBrowser() : Graph
 	PauseUpdate; Silent 1		// building window...
-	Display /W=(1256.25,302,1688.25,738.5)/K=1  as "DataBrowser"
+	Display /W=(402.75,313.25,822.75,640.25)/K=1  as "DataBrowser"
 	Button button_BSP_open,pos={3.00,3.00},size={24.00,24.00},disable=1,proc=DB_ButtonProc_Panel
 	Button button_BSP_open,title="<<",help={"Open Side Panel"}
 	Button button_BSP_open,userdata(ResizeControlsInfo)=A"!!,>M!!#8L!!#=#!!#=#z!!#](Aon\"Qzzzzzzzzzzzzzz!!#](Aon\"Qzz"

Packages/MIES/MIES_WaveDataFolderGetters.ipf

@@ -6282,7 +6282,7 @@ End
 Function/WAVE GetAnaFuncDashboardInfoWave(dfr)
 	DFREF dfr
 
-	variable versionOfNewWave = 2
+	variable versionOfNewWave = 3
 
 	ASSERT(DataFolderExistsDFR(dfr), "Invalid dfr")
 	WAVE/T/Z/SDFR=dfr wv = dashboardInfoWave
@@ -6291,13 +6291,15 @@ Function/WAVE GetAnaFuncDashboardInfoWave(dfr)
 		return wv
 	elseif(WaveExists(wv))
 		// handle upgrade
+		Redimension/N=(-1, 4) wv
 	else
-		Make/T/N=(MINIMUM_WAVE_SIZE, 3) dfr:dashboardInfoWave/Wave=wv
+		Make/T/N=(MINIMUM_WAVE_SIZE, 4) dfr:dashboardInfoWave/Wave=wv
 	endif
 
 	SetDimLabel COLS, 0, $STIMSET_ACQ_CYCLE_ID_KEY, wv
 	SetDimLabel COLS, 1, $"Passing Sweeps", wv
 	SetDimLabel COLS, 2, $"Failing Sweeps", wv
+	SetDimLabel COLS, 3, $"Ongoing DAQ", wv
 
 	SetWaveVersion(wv, versionOfNewWave)
 

Packages/Testing-MIES/UTF_BasicHardwareTests.ipf

@@ -4072,7 +4072,7 @@ Function DataBrowserCreatesBackupsByDefault_REENTRY([str])
 	sweepNo = AFH_GetLastSweepAcquired(str)
 	CHECK_EQUAL_VAR(sweepNo, 0)
 
-	DB_OpenDataBrowser()
+	OpenDatabrowser()
 
 	WAVE sweepWave = GetSweepWave(str, 0)
 	DFREF sweepFolder = GetWavesDataFolderDFR(sweepWave)

Packages/Testing-MIES/UTF_HardwareMain.ipf

@@ -993,18 +993,14 @@ End
 
 static Function CheckDashboard(string device, WAVE headstageQC)
 
-	string databrowser, bsPanel
+	string databrowser
 	variable numEntries, i, state
 
 	databrowser = DB_FindDataBrowser(device)
 	DFREF dfr = BSP_GetFolder(databrowser, MIES_BSP_PANEL_FOLDER)
 	WAVE/T/Z listWave = GetAnaFuncDashboardListWave(dfr)
 	CHECK_WAVE(listWave, TEXT_WAVE)
 
-	// enable the dashboard
-	bsPanel = BSP_GetPanel(databrowser)
-	PGC_SetAndActivateControl(bsPanel, "check_BrowserSettings_DS", val = 1)
-
 	// Check that we have acquired some sweeps
 	WAVE numericalValues = GetLBNumericalValues(device)
 	WAVE/Z sweeps = GetSweepsWithSetting(numericalValues, "SweepNum")
@@ -1316,3 +1312,11 @@ Function StopTPWhenFinished(STRUCT WMBackgroundStruct &s)
 
 	return 0
 End
+
+Function OpenDatabrowser()
+	string win, bsPanel
+
+	win = DB_OpenDatabrowser()
+	bsPanel = BSP_GetPanel(win)
+	PGC_SetAndActivateControl(bsPanel, "check_BrowserSettings_DS", val = 1)
+End

Packages/Testing-MIES/UTF_MultiPatchSeqDaScale.ipf

@@ -65,7 +65,7 @@ static Function AcquireData(s, device, [postInitializeFunc, preAcquireFunc])
 	MSQ_CreateOverrideResults(device, 0, MSQ_DA_SCALE)
 
 	PGC_SetAndActivateControl(device, "DataAcquireButton")
-	DB_OpenDatabrowser()
+	OpenDatabrowser()
 End
 
 static Constant INDEP_EACH_SCI = 0x01

Packages/Testing-MIES/UTF_MultiPatchSeqFastRheoEstimate.ipf

@@ -71,7 +71,7 @@ static Function AcquireData(s, device, [postInitializeFunc, preAcquireFunc])
 	endif
 
 	PGC_SetAndActivateControl(device, "DataAcquireButton")
-	DB_OpenDatabrowser()
+	OpenDatabrowser()
 End
 
 static Constant INDEP_EACH_SCI = 0x01