Commits

hardwood committed 73f2d0d Merge

Merge

Comments (0)

Files changed (5)

Acquisition/Acquisition Wave Functions.ipf

File contents unchanged.

Acquisition/Acquisition.ipf

 #ifdef Rick
 	//ISI=10+floor(abs(enoise(10)))
 #endif
+#ifdef Aryn
+	//printf "We injected %d pA\r",GetCurrent()
+#endif
 	//endif
 End
 

Acquisition/Seal Test.ipf

 
 // $Author: rick $
+<<<<<<< local
 // $Rev: 633 $
 // $Date: 2013-03-28 15:53:22 -0700 (Thu, 28 Mar 2013) $
+=======
+// $Rev: 626 $
+// $Date: 2013-02-07 09:36:23 -0700 (Thu, 07 Feb 2013) $
+>>>>>>> other
 
 #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

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 $
+<<<<<<< local
 // $Rev: 633 $
 // $Date: 2013-03-28 15:53:22 -0700 (Thu, 28 Mar 2013) $
+=======
+// $Rev: 566 $
+// $Date: 2011-07-14 09:16:22 -0400 (Thu, 14 Jul 2011) $
+>>>>>>> other
 
 #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))
 
 #ifdef Acq
 #include "Spike Functions"
+<<<<<<< local
+=======
+#endif
+>>>>>>> other
 #include "Waves Average"
 
 override function MakeLogPanel()
+<<<<<<< local
 	if(WinType("LogPanel"))
 		DoWindow /F LogPanel
     return 0
     NewNotebook/W=(600,570,940,710) /F=0/N=LogPanel
  	endif
 end
+=======
+        if(WinType("LogPanel"))
+                DoWindow /F LogPanel
+                return 0
+        else
+                NewNotebook/W=(600,570,940,710) /F=0/N=LogPanel
+        endif
+        end
+        
+>>>>>>> other
       
+<<<<<<< local
+=======
+
+
+
+>>>>>>> other
 function StimulusTable()
 	dowindow /k StimTable
 	edit /k=1/n=StimTable as "Stimulus Table"
 end
 
 
+<<<<<<< local
+=======
+
+#pragma rtGlobals=1		// Use modern global access method.
+
+>>>>>>> other
 //This procedure file keeps track of all custom preferences.  In general, these preferences are 
 //user entered parameters in dialog boxes.  Managing preferences this way causes dialog box
 //values to be preserved, even when Igor is turned off.  See the Igor manual for more information
 			print "cell attached CV = ", extraCellCV
 	
 
+<<<<<<< local
 End
 
-#endif
+#endif=======
+End>>>>>>> other