Commits

Richard Gerkin  committed 3c822e1 Merge

Merged

  • Participants
  • Parent commits f5caddf, 3a3bc01

Comments (0)

Files changed (5)

File Acquisition/Acquisition Settings.ipf

 end
 
 // Applies a loaded package instance to the given channel.  Deals with some of the hierarchical application of package instances, e.g. selecting a channel configuration often implies selecting a stimulus.  
-static Function SelectPackageInstance(module,package,instance[,special])
+Function SelectPackageInstance(module,package,instance[,special])
 	string package,instance,module,special
 	
 	special=selectstring(!paramisdefault(special),"",special)
 		case "channelConfigs":
 			Core#SetStrPackageSetting(module,"channelConfigs",name,"DAQ",DAQ) // Set the stimulus name.  
 			string stimName=GetStimulusName(chan)
-			Core#SelectPackageInstance(module,"stimuli",stimName,special=special)
+			SelectPackageInstance(module,"stimuli",stimName,special=special)
 			break
 		case "stimuli":
 			Core#SetStrPackageSetting(module,"channelConfigs",name,"stimulus",instance) // Set the stimulus name.  

File Acquisition/Acquisition Windows.ipf

 						Core#SetControlUserData(info.ctrlName,"oldLabel",newLabel)
 						Core#SetStrPackageSetting(module,"channelConfigs",name,"label_",newLabel) // Update the channel label.  
 					endif
-					Core#SelectPackageInstance(module,"channelConfigs",newLabel,special=special)
+					SelectPackageInstance(module,"channelConfigs",newLabel,special=special)
 					SetVariable $info.ctrlName userData(oldLabel)=Labels[chan]
 					string chanName=GetChanName(chan)
 					if(!stringmatch(newLabel,chanName))
 					break
 				default:
 					string stimName=info.popStr
-					Core#SelectPackageInstance(module,"stimuli",stimName,special=special)
+					SelectPackageInstance(module,"stimuli",stimName,special=special)
 			endswitch
 			break
 		case "SaveMode":

File Acquisition/ITC Wrappers.ipf

 	wave /sdfr=daqDF InputMultiplex
 	variable boardGain=GetBoardGain()
 	variable duration=GetAcqDuration()
-	nvar /sdfr=df points
+	nvar /sdfr=df pointsS
 	variable i
 	for(i=0;i<4;i+=1)
 		chan=chans[i]

File Acquisition/NIDAQmx Wrappers.ipf

 static Function DefaultKHz(DAQ)
 	String DAQ
 	
-	dfref df=ObjectManifest(module,"DAQs","kHz")
+	dfref df=Core#ObjectManifest(module,"DAQs","kHz")
 	nvar /sdfr=df value
 	return value
 End
 	variable pin = Core#VarPackageSetting("Acq","DAQs","Generic","StartTrigger",default_=pin_in)
 	string trig_in
 	sprintf trig_in,"/%s/%s%d",deviceName,pin_prefix,pin
-	DAQmx_WaveformGen /DEV=deviceName /ERRH="ErrorHook()" /NPRD=(param) /STRT=1 /TRIG={trig,1,1} list
+	DAQmx_WaveformGen /DEV=deviceName /ERRH="ErrorHook()" /NPRD=(param) /STRT=1 /TRIG={trig_in,1,1} list
 	//DAQmx_WaveformGen /DEV="dev1" /CLK={"/dev1/ai/sampleclock",1} /ERRH="ErrorHook()" /NPRD=1 /STRT=1 /TRIG={"/dev1/"+trigChan,1,1} list
 End
 
 		deviceName="dev1"
 	endif
 	fDAQmx_CTR_Finished(deviceName,0)
-	string trig_in
+	string trig_out
 	sprintf trig_out,"%s%d",pin_prefix,pin_out
 	DAQmx_CTR_OutputPulse /DEV=deviceName /DELY=0 /FREQ={1/isi,0.5} /NPLS=0 /STRT=0 /OUT=trig_out 0
 	return fDAQmx_CTR_Start(deviceName,0)

File Basics/I-O.ipf

 	HDF5SaveGroup /O /R /T root:, fileID, "."
 	HDF5CloseFile /Z fileID  
 #else
-	print "HDF5 XOP not loaded.  
+	print "HDF5 XOP not loaded."  
 #endif
 end