Commits

hardwood  committed 5afbb65

Merged changes from Aryn

  • Participants
  • Parent commits 907712e

Comments (0)

Files changed (6)

File Acquisition/Acquisition Wave Functions.ipf

 // $Author: rick $
-// $Rev: 632 $
-// $Date: 2013-03-15 17:17:39 -0700 (Fri, 15 Mar 2013) $
+// $Rev: 626 $
+// $Date: 2013-02-07 09:36:23 -0700 (Thu, 07 Feb 2013) $
 
 #pragma rtGlobals=1		// Use modern global access method.
 static strconstant module="Acq"
 	endif
 end
 
+//sin function added by AG 3-21-13
+function Sine_stim(Stimulus,chan,firstSample,lastSample,pulseNum,pulseSet,sweepParity)
+	wave Stimulus
+	variable chan,firstSample,lastSample,pulseNum,pulseSet,sweepParity
+	
+	variable begin=GetStimParam("Begin",chan,pulseSet)		//Begin time
+	variable width=GetStimParam("Width",chan,pulseSet)		//Set frequency (Hz)
+	variable ampl=GetStimParam("Ampl",chan,pulseSet)		//Set amplitude
+	
+	make/o/n=10000 SineWave
+	setscale x,0,1,SineWave  
+	SineWave = Ampl * sin(2*pi*x*width)
+	
+	save SineWave
+	
+	display SineWave
+	
+//From duplicated code- probably don't need
+//	variable ampl=GetStimParam("Ampl",chan,pulseSet)
+
+//	variable width=lastSample-firstSample
+//	variable start=abs(enoise(dimsize(Stimulus,0)))
+//	Stimulus[start,start+width][sweepParity][pulseSet]+=ampl+dampl*pulseNum
+//	variable pulses=GetStimParam("Pulses",chan,pulseSet)
+//	if(pulseNum==pulses-1)
+//		Convolve AlphaSynapso(1,3,0,50),Stimulus
+//	endif
+end
+
+
 function Optimus1_stim(Stimulus,chan,firstSample,lastSample,pulseNum,pulseSet,sweepParity)
 	wave Stimulus
 	variable chan,firstSample,lastSample,pulseNum,pulseSet,sweepParity

File Acquisition/Seal Test.ipf

 
 // $Author: rick $
-// $Rev: 632 $
-// $Date: 2013-03-15 17:17:39 -0700 (Fri, 15 Mar 2013) $
+// $Rev: 626 $
+// $Date: 2013-02-07 09:36:23 -0700 (Thu, 07 Feb 2013) $
 
 #pragma rtGlobals=1		// Use modern global access method.
 
 		string axes=AxisList("SealTestWin")
 		string sweepaxes=listmatch(axes,"chan*")
 		variable i
-		for(i=0;i<itemsinlist(sweepAxes);i+=1)
-			string sweepAxis=stringfromlist(i,sweepAxes)
-			SetAxis $sweepAxis,V_median-(V_median-V_min)*1.5,V_avg+(V_max-V_median)*1.5
-		endfor
+		string sweepAxis = "chan"+num2str(chan)+"_axis"
+		variable center = v_median
+		ControlInfo $("Range_"+num2str(chan))
+		variable range = v_value
+		variable low = center - range/2
+		variable high = center + range/2
+		SetAxis $sweepAxis,low,high
 	endif
 	Duplicate /o chanDF:InputHistory, chanDF:Threshold /WAVE=Threshold 
 	ControlInfo $("Threshold_"+channel); Variable thresh=V_Value

File Basics/Statistics.ipf

 	return ClusterDispersions
 end
 
-threadsafe Function CV(w)//[,correction,x1,x2])
+threadsafe Function ComputeCV(w)//[,correction,x1,x2])
 	wave w
 	//Variable correction // Correct for slow variations in the signal that artificially increase the standard deviation.  
 	//Variable x1,x2

File Basics/Wave Functions.ipf

 			break
 		case "CV":
 			if(mt)
-				multithread result=CV(GetBeam(w,dim,{p,q,r}))
+				multithread result=ComputeCV(GetBeam(w,dim,{p,q,r}))
 			else
-				result=CV(GetBeam(w,dim,{p,q,r}))
+				result=ComputeCV(GetBeam(w,dim,{p,q,r}))
 			endif
 			break
 		case "Z":

File Other/Batch Plotting.ipf

-// $URL: svn://raptor.cnbc.cmu.edu/rick/recording-artist/Recording%20Artist/Other/Batch%20Plotting.ipf $
+// $URL: svn://churro.cnbc.cmu.edu/igorcode/Recording%20Artist/Other/Batch%20Plotting.ipf $
 // $Author: rick $
-// $Rev: 628 $
-// $Date: 2013-02-11 12:57:08 -0700 (Mon, 11 Feb 2013) $
+// $Rev: 566 $
+// $Date: 2011-07-14 09:16:22 -0400 (Thu, 14 Jul 2011) $
 
 #pragma rtGlobals=1		// Use modern global access method.
 //#include "Batch Wave Functions"
 	endfor
 End
 
-Function KillTables([match])
-	string match
-	if(ParamIsDefault(match))
-		match="*"
-	endif
-	
-	KillAll("tables",match=match)
+Function KillTables()
+	KillAll("tables")
 End
 
 Function KillGraphs([match])
 End
 
 //// Plot all combinations of list1 against list2 (data pairs with lines connecting them)
-Function PlotPairsWithLinesMany(list1,list2,bad_list)//,suffix)
+//Function PlotPairsWithLinesMany(list1,list2,bad_list)//,suffix)
 	String list1,list2//,suffix
 	String bad_list // Makes sure nothing on the bad list (e.g. current too small) is on the returned list
 	String prefix="time_constants_"
 	endfor
 End
 
-Function KillAllFits() // Removes Fits from every graph there is and then deletes them
+//Function KillAllFits() // Removes Fits from every graph there is and then deletes them
 	String list=WinList("*",";","")
 	Variable i,j
 	String window_name
 End
 
 // A window that can show the waves of a folder, and in which those waves can be browsed.  
-Function BrowseFolder(df[,prefix])
+//Function BrowseFolder(df[,prefix])
 	dfref df // Data folder reference. 
 	String prefix // e.g. "Sweep".   
 	if(ParamIsDefault(prefix))

File Users/Aryn.ipf

 #pragma rtGlobals=1		// Use modern global access method.
 
-function StimulusTable()
+//
+//#ifdef Acq
+//#include "Spike Functions"
+//#endif
+
+//function StimulusTable()
 	dowindow /k StimTable
 	edit /k=1/n=StimTable.ld as "Stimulus Table"
 	variable num_channels = GetNumChannels() // Number of channels.