#pragma rtGlobals=1		// Use modern global access method.
#pragma version=4.00
#pragma IgorVersion=6.0

//
// WARNING: there are a lot of assumptions that went into this code at the first pass
// that will need to be made generic before a release to the wild
//
//
// - some manipulations assume a square matrix
// - naming schemes are assumed (to be documented)
//
//


//
//
Proc LoadQxQy()

	LoadWave/G/D/W/A
	String fileName = S_fileName
	Variable numCols = V_flag

	String w0,w1,w2,n0,n1,n2
		
	// put the names of the three loaded waves into local names
	n0 = StringFromList(0, S_waveNames ,";" )
	n1 = StringFromList(1, S_waveNames ,";" )
	n2 = StringFromList(2, S_waveNames ,";" )
	
	//remove the semicolon AND period from files from the VAX
	w0 = CleanupName((S_fileName + "_qx"),0)
	w1 = CleanupName((S_fileName + "_qy"),0)
	w2 = CleanupName((S_fileName + "_i"),0)
	
	String baseStr=w1[0,strlen(w1)-4]
	if(DataFolderExists("root:"+baseStr))
			DoAlert 1,"The file "+S_filename+" has already been loaded. Do you want to load the new data file, overwriting the data in memory?"
			if(V_flag==2)	//user selected No, don't load the data
				SetDataFolder root:
				KillWaves $n0,$n1,$n2		// kill the default waveX that were loaded
				return		//quits the macro
			endif
			SetDataFolder $("root:"+baseStr)
	else
		NewDataFolder/S $("root:"+baseStr)
	endif
	
	////overwrite the existing data, if it exists
	Duplicate/O $("root:"+n0), $w0
	Duplicate/O $("root:"+n1), $w1
	Duplicate/O $("root:"+n2), $w2
	
	Variable/G gIsLogScale = 0
	
	Variable num=numpnts($w0)
	// assume that the Q-grid is "uniform enough" for DISPLAY ONLY
	// use the 3 original waves for all of the fitting...
	ConvertQxQy2Mat($w0,$w1,$w2,baseStr+"_mat")
	Duplicate/O $(baseStr+"_mat"),$(baseStr+"_lin") 		//keep a linear-scaled version of the data
	
	PlotQxQy(baseStr)		//this sets the data folder back to root:!!
	
	//don't create the triplet - not really of much use
//	Make/D/O/N=(num,3) $(baseStr+"_tri")
//	$(baseStr+"_tri")[][0] = $w0[p]		// Qx
//	$(baseStr+"_tri")[][1] = $w1[p]		// Qy
//	$(baseStr+"_tri")[][2] = $w2[p]		// Intensity

	//clean up		
	SetDataFolder root:
	KillWaves/Z $n0,$n1,$n2
EndMacro

//does not seem to need to be flipped at all from the standard QxQy output
//
// plots the data, as surface0, YellowHot color table
//
Proc PlotQxQy(str)
	String str
	Prompt str,"Pick the data folder containing 2D data",popup,getAList(4)

	PauseUpdate; Silent 1	// Building Gizmo 6 window...

	// Do nothing if the Gizmo XOP is not available.
	if(exists("NewGizmo")!=4)
		DoAlert 0, "Gizmo XOP must be installed"
		return
	endif

	String data = "root:"+str+":"+str+"_mat"
	
	NewGizmo/N=$str/T=str /W=(169,44,495,359)
	ModifyGizmo startRecMacro
	AppendToGizmo Surface=$data,name=surface0

	// for constant color (data is a blue color, lighter on the bottom)
//	ModifyGizmo ModifyObject=surface0 property={ surfaceColorType,1}
//	ModifyGizmo ModifyObject=surface0 property={ srcMode,0}
//	ModifyGizmo ModifyObject=surface0 property={ frontColor,0.749996,0.811093,1,1}
//	ModifyGizmo ModifyObject=surface0 property={ backColor,0.250019,0.433326,1,1}
	//e constant color
	
	//for color table	
	ModifyGizmo ModifyObject=surface0 property={ srcMode,0}
//	ModifyGizmo ModifyObject=surface0 property={ surfaceCTab,Blue}
	ModifyGizmo ModifyObject=surface0 property={ surfaceCTab,ColdWarm}
	ModifyGizmo ModifyObject=surface0 property={ SurfaceCTABScaling,4}
	//e color table
	
	AppendToGizmo Axes=boxAxes,name=axes0
	ModifyGizmo ModifyObject=axes0,property={0,axisRange,-1,-1,-1,1,-1,-1}
	ModifyGizmo ModifyObject=axes0,property={1,axisRange,-1,-1,-1,-1,1,-1}
	ModifyGizmo ModifyObject=axes0,property={2,axisRange,-1,-1,-1,-1,-1,1}
	ModifyGizmo ModifyObject=axes0,property={3,axisRange,-1,1,-1,-1,1,1}
	ModifyGizmo ModifyObject=axes0,property={4,axisRange,1,1,-1,1,1,1}
	ModifyGizmo ModifyObject=axes0,property={5,axisRange,1,-1,-1,1,-1,1}
	ModifyGizmo ModifyObject=axes0,property={6,axisRange,-1,-1,1,-1,1,1}
	ModifyGizmo ModifyObject=axes0,property={7,axisRange,1,-1,1,1,1,1}
	ModifyGizmo ModifyObject=axes0,property={8,axisRange,1,-1,-1,1,1,-1}
	ModifyGizmo ModifyObject=axes0,property={9,axisRange,-1,1,-1,1,1,-1}
	ModifyGizmo ModifyObject=axes0,property={10,axisRange,-1,1,1,1,1,1}
	ModifyGizmo ModifyObject=axes0,property={11,axisRange,-1,-1,1,1,-1,1}
	ModifyGizmo ModifyObject=axes0,property={-1,axisScalingMode,1}
	ModifyGizmo ModifyObject=axes0,property={-1,axisColor,0,0,0,1}
	ModifyGizmo ModifyObject=axes0,property={0,ticks,3}
	ModifyGizmo ModifyObject=axes0,property={1,ticks,3}
	ModifyGizmo ModifyObject=axes0,property={2,ticks,3}
	ModifyGizmo ModifyObject=axes0,property={0,fontScaleFactor,1.5}
	ModifyGizmo ModifyObject=axes0,property={1,fontScaleFactor,1.5}
	ModifyGizmo ModifyObject=axes0,property={2,fontScaleFactor,1.5}
	ModifyGizmo setDisplayList=0, opName=clearColor0, operation=clearColor, data={1,0.917,0.75,1}
	ModifyGizmo setDisplayList=1, object=surface0
	ModifyGizmo setDisplayList=2, object=axes0
	ModifyGizmo SETQUATERNION={0.521287,-0.097088,-0.138769,0.836408}
	ModifyGizmo autoscaling=1
	ModifyGizmo currentGroupObject=""
	ModifyGizmo compile

	ModifyGizmo NamedHook={GizmoContours,WMGizmoContoursNamedHook}
	ModifyGizmo endRecMacro
	
// don't bother with the flat image plot right now
	
//	Display $yw vs $xw
//	modifygraph log=0
//	ModifyGraph mode=3,marker=16,zColor($yw)={$zw,*,*,YellowHot,0}
//	ModifyGraph standoff=0
//	ModifyGraph width={Aspect,1}
//	ModifyGraph lowTrip=0.001

End

Proc FakeQxQy(minQx,maxQx,minQy,maxQy,numPix,dataFolder)
	Variable minQx=-0.1,maxQx=0.1,minQy=-0.1,maxQy=0.1
	Variable numPix=64
	String dataFolder="fake2DData"

	String baseStr=dataFolder
	

	if(DataFolderExists("root:"+baseStr))
			DoAlert 1,"Fake data "+baseStr+" has already been created. Do you want to overwrite this fake data set?"
			if(V_flag==2)	//user selected No, don't load the data
				SetDataFolder root:
				return		//quits the macro
			endif
			SetDataFolder $("root:"+baseStr)
	else
		NewDataFolder/S $("root:"+baseStr)
	endif

	Make/O/D/N=(numPix*numPix) $(baseStr+"_qx"),$(baseStr+"_qy"),$(baseStr+"_i")
	
	$(baseStr+"_i") = 1
	
	Make/O/D/N=(numPix) tmpX,tmpY
	
	variable delX,delY
	delX = (maxQx - minQx)/numPix
	delY = (maxQy - minQy)/numPix
	tmpX = minQx + x*delX
	tmpY = minQy + x*delY
	
	// get rid of Q=0 values in the waves (may be a bad actor in model calculations)
	//
	tmpX = (tmpX == 0) ? 1e-6 : tmpX
	tmpY = (tmpY == 0) ? 1e-6 : tmpY 
	
	// X wave varies more rapidly
	// Y wave is blocks of values
	Variable ii=0
	do
		$(baseStr+"_qy")[ii*numPix,(ii+1)*numPix] = tmpY[ii]
		ii+=1
	while(ii<numPix)
	
	$(baseStr+"_qx") = tmpX[mod(p,numPix)]
	
	Variable/G gIsLogScale = 0
	
	// assume that the Q-grid is "uniform enough" for DISPLAY ONLY
	// use the 3 original waves for all of the fitting...
	ConvertQxQy2Mat($(baseStr+"_qx"),$(baseStr+"_qy"),$(baseStr+"_i"),baseStr+"_mat")
	Duplicate/O $(baseStr+"_mat"),$(baseStr+"_lin") 		//keep a linear-scaled version of the data
	
	PlotQxQy(baseStr)		//this sets the data folder back to root:!!

	//clean up		
	SetDataFolder root:
	
EndMacro

// this assumes that:
// --QxQy data was written out in the format specified by the Igor macros, that is the x varies most rapidly
// --the matrix is square!
//
// probably some other stuff...
//
Function UpdateQxQy2Mat(Qx,Qy,inten,linMat,mat)
	Wave Qx,Qy,inten,linMat,mat
	
	Variable xrows=DimSize(mat, 0 )			//assumes square matrix!!
	
	String folderStr=GetWavesDataFolder(Qx,1)
	NVAR gIsLogScale=$(folderStr+"gIsLogScale")
	
	linMat = inten[q*xrows+p]
	
	if(gIsLogScale)
		mat = log(linMat)
	else
		mat = linMat
	endif
	
	return(0)
End

// this assumes that:
// --QxQy data was written out in the format specified by the Igor macros, that is the x varies most rapidly
// --the matrix is square!
//
// probably some other stuff...
//
Function ConvertQxQy2Mat(Qx,Qy,inten,matStr)
	Wave Qx,Qy,inten
	String matStr
	
	String folderStr=GetWavesDataFolder(Qx,1)
	
	Variable num=sqrt(numpnts(Qx))		//assumes square matrix, Qx = num x num points long
	Make/O/D/N=(num,num) $(folderStr + matStr)
	Wave mat=$matStr
	
	WaveStats/Q Qx
	SetScale/I x, V_min, V_max, "", mat
	WaveStats/Q Qy
	SetScale/I y, V_min, V_max, "", mat
	
	Variable xrows=num
	
	mat = inten[q*xrows+p]
	
	return(0)
End


//str is the full path to the surface to append
Proc AppendSurfaceToGizmo(str)
	String str
	
	PauseUpdate; Silent 1	// Building Gizmo 6 window...

	AppendToGizmo/Z Surface=$str,name=surface1
	
	// for a constant color (model is darker on top, lighter on the bottom)
	//need these two lines, plus a color
	ModifyGizmo ModifyObject=surface1 property={ surfaceColorType,1}
	ModifyGizmo ModifyObject=surface1 property={ srcMode,0}
	//green
	ModifyGizmo ModifyObject=surface1 property={ frontColor,0.528923,0.882353,0.321584,1}
	ModifyGizmo ModifyObject=surface1 property={ backColor,0.300221,0.6,1.5259e-05,1}
	//red
//	ModifyGizmo ModifyObject=surface1 property={ frontColor,1,0.749996,0.749996,1}
//	ModifyGizmo ModifyObject=surface1 property={ backColor,1,0.250019,0.250019,1}

	ModifyGizmo ModifyObject=surface1 property={ SurfaceCTABScaling,4}
	
	// for a color table (maybe not a good choice for vizualization if data uses a color table)
//	ModifyGizmo ModifyObject=surface1 property={ srcMode,0}
//	ModifyGizmo ModifyObject=surface1 property={ surfaceCTab,Red}
	
//	ModifyGizmo setDisplayList=0, object=surface0
//	ModifyGizmo setDisplayList=1, object=axes0
	ModifyGizmo setDisplayList=3, object=surface1
	ModifyGizmo SETQUATERNION={0.565517,-0.103105,-0.139134,0.806350}
//	ModifyGizmo autoscaling=1
//	ModifyGizmo currentGroupObject=""
	ModifyGizmo compile

//	ModifyGizmo endRecMacro
End

// would be nice, but I can't get this to work...
//
//Macro AdjustColorTables()
//
//	ModifyGizmo ModifyObject=surface1 property={ srcMode,0}
//	ModifyGizmo ModifyObject=surface1 property={ surfaceCTab,Rainbow}
//	ModifyGizmo setDisplayList=3, object=surface1
////	ModifyGizmo SETQUATERNION={0.565517,-0.103105,-0.139134,0.806350}
//	ModifyGizmo autoscaling=1
//	ModifyGizmo currentGroupObject=""
//	ModifyGizmo compile
//	
//end

Function LogToggle2DButtonProc(ba) : ButtonControl
	STRUCT WMButtonAction &ba

	switch( ba.eventCode )
		case 2: // mouse up
			// click code here
			String winStr=TopGizmoWindow()
			if(strlen(winstr)==0)
				Print "no gizmo window"
				break
			endif
			// the winStr is also the data folder
			// toggle everything in the data folder
			ToggleFolderScaling(winStr)		
			break
	endswitch

	return 0
End

Function Plot2DButtonProc(ba) : ButtonControl
	STRUCT WMButtonAction &ba

	switch( ba.eventCode )
		case 2: // mouse up
			// click code here
			Execute "PlotQxQy()"
			break
	endswitch

	return 0
End

Function Append2DModelButtonProc(ba) : ButtonControl
	STRUCT WMButtonAction &ba

	switch( ba.eventCode )
		case 2: // mouse up
			// click code here
			//str is the full path to the surface to append
			String DF=TopGizmoWindow()
			String str,funcStr,suffix
			ControlInfo/W=WrapperPanel popup_1
			funcStr = S_Value
			suffix = getModelSuffix(getFunctionCoef(funcStr))
			str = "root:"+DF+":"+suffix+"_mat"
			
			Execute "AppendSurfaceToGizmo(\""+str+"\")"
//			Print str
			break
	endswitch

	return 0
End

// toggle the scaling of every matrix in the folder
Function ToggleFolderScaling(DF)
	String DF

	// look for waves DF+"_mat" (the data)
	// and models prefix + "_mat"
	SetDataFolder $("root:"+DF)
	//check the global to see the state of the data
	NVAR gIsLogScale = gIsLogScale
	
	String matrixList=WaveList("*_mat",";",""),item
	Variable ii=0,num=itemsinlist(matrixlist,";"),len
	
	for(ii=0;ii<num;ii+=1)
			item = StringFromList(ii,matrixList,";")
			len = strlen(item)
			Wave w = $item
			Wave linW = $(item[0,len-5]+"_lin")
			if(gisLogScale)
				//make linear
				w=linW
			else	
				//make log scale
				w=log(linW)
			endif
	endfor	
	
	// toggle the global
	gIsLogScale = !gIsLogScale
	
	SetDataFolder root:
	return(0)
End


Function Load2DDataButtonProc(ba) : ButtonControl
	STRUCT WMButtonAction &ba

	switch( ba.eventCode )
		case 2: // mouse up
			// click code here
			Execute "LoadQxQy()"
			break
	endswitch

	return 0
End


// dispatch the fit
Function Do2DFitButtonProc(ba) : ButtonControl
	STRUCT WMButtonAction &ba

	String folderStr,funcStr,coefStr
	Variable useCursors,useEps,useConstr
	
	switch( ba.eventCode )
		case 2: // mouse up
			ControlInfo/W=WrapperPanel popup_0
			folderStr=S_Value
			
			ControlInfo/W=WrapperPanel popup_1
			funcStr=S_Value
			
			ControlInfo/W=WrapperPanel popup_2
			coefStr=S_Value
			
			ControlInfo/W=WrapperPanel check_0
			useCursors=V_Value
			//
			// NO CURSORS for 2D waves - force to zero
			//
			useCursors = 0
			//
			ControlInfo/W=WrapperPanel check_1
			useEps=V_Value
			ControlInfo/W=WrapperPanel check_2
			useConstr=V_Value
			
			if(!CheckFunctionAndCoef(funcStr,coefStr))
				DoAlert 0,"The coefficients and function type do not match. Please correct the selections in the popup menus."
				break
			endif
			
			FitWrapper2D(folderStr,funcStr,coefStr,useCursors,useEps,useConstr)
			
			//	DoUpdate (does not work!)
			//?? why do I need to force an update ??
			if(!exists("root:"+folderStr+":"+coefStr))
				Wave w=$coefStr
			else
				Wave w=$("root:"+folderStr+":"+coefStr) //smeared coefs in data folder 
			endif
			w[0] += 1e-6
			w[0] -= 1e-6
	
			break
	endswitch

	return 0
End

// wrapper to do the desired fit, pretty much a clone of FitWrapper, the 1D version
// 
// folderStr is the data folder for the desired data set
//
// Currently the limitations are:
// - I have no error waves for the intensity
// - There is no smeared model
// - Cursors can't be used
// - the report *probably* won't work
Function FitWrapper2D(folderStr,funcStr,coefStr,useCursors,useEps,useConstr)
	String folderStr,funcStr,coefStr
	Variable useCursors,useEps,useConstr

	String suffix=getModelSuffix(coefStr)
	
	SetDataFolder $("root:"+folderStr)
	if(!exists(coefStr))
		// must be unsmeared model, work in the root folder
		SetDataFolder root:				
		if(!exists(coefStr))		//this should be fine if the coef filter is working, but check anyhow
			DoAlert 0,"the coefficient and data sets do not match"
			return 0
		endif
	endif
		
	WAVE cw=$(coefStr)	
	Wave hold=$("Hold_"+suffix)
	Wave/T lolim=$("LoLim_"+suffix)
	Wave/T hilim=$("HiLim_"+suffix)
	Wave eps=$("epsilon_"+suffix)
	
// fill a struct instance whether I need one or not
	String DF="root:"+folderStr+":"	
	
	Struct ResSmearAAOStruct fs
//	WAVE resW = $(DF+folderStr+"_res")		
//	WAVE fs.resW =  resW
	WAVE inten=$(DF+folderStr+"_i")
	WAVE Qx=$(DF+folderStr+"_qx")
	WAVE Qy=$(DF+folderStr+"_qy")
//	Wave fs.coefW = cw
//	Wave fs.yW = yw
//	Wave fs.xW = xw
	
	// generate my own error wave for I(qx,qy)
	Duplicate/O inten sw
	sw = sqrt(sw)		//assumes Poisson statistics for each cell (counter)
//	sw = 0.05*sw		// uniform 5% error? tends to favor the low intensity too strongly

	// generate my own mask wave - as a matrix first, then redimension to N*N vector
	// default mask is two pixels all the way around, (0 is excluded, 1 is included)
	WAVE DataMat=$(DF+folderStr+"_lin")
	if(exists(DF+"mask") == 0)
		Duplicate/O dataMat mask
		Variable bsRadius=8		//pixels?
		MakeBSMask(mask,bsRadius)
	Endif
	

	
//	Duplicate/O yw $(DF+"FitYw")
//	WAVE fitYw = $(DF+"FitYw")
//	fitYw = NaN

	//for now, use res will always be 0 for 2D functions	
	Variable useRes=0
	if(stringmatch(funcStr, "Smear*"))		// if it's a smeared function, need a struct
		useRes=1
	endif
	
	// do not construct constraints for any of the coefficients that are being held
	// -- this will generate an "unknown error" from the curve fitting
	Make/O/T/N=0 constr
	if(useConstr)
		String constraintExpression
		Variable i, nPnts=DimSize(lolim, 0),nextRow=0
		for (i=0; i < nPnts; i += 1)
			if (strlen(lolim[i]) > 0 && hold[i] == 0)
				InsertPoints nextRow, 1, constr
				sprintf constraintExpression, "K%d > %s", i, lolim[i]
				constr[nextRow] = constraintExpression
				nextRow += 1
			endif
			if (strlen(hilim[i]) > 0 && hold[i] == 0)
				InsertPoints nextRow, 1, constr
				sprintf constraintExpression, "K%d < %s", i, hilim[i]
				constr[nextRow] = constraintExpression
				nextRow += 1
			endif
		endfor
	endif

///// NO CURSORS for 2D waves
	//if useCursors, and the data is USANS, need to feed a (reassigned) trimmed matrix to the fit
//	Variable pt1,pt2,newN
//	if(useCursors && (dimsize(resW,1) > 4) )
//		if(pcsr(A) > pcsr(B))
//			pt1 = pcsr(B)
//			pt2 = pcsr(A)
//		else
//			pt1 = pcsr(A)
//			pt2 = pcsr(B)
//		endif
//		newN = pt2 - pt1 + 1		// +1 includes both cursors in the fit
//		Make/O/D/N=(newN,newN) $(DF+"crsrResW")
//		WAVE crsrResW = $(DF+"crsrResW")
//		crsrResW = resW[p+pt1][q+pt1]
//		//assign to the struct
//		WAVE fs.resW =  crsrResW		
//	endif

// create these variables so that FuncFit will set them on exit
	Variable/G V_FitError=0				//0=no err, 1=error,(2^1+2^0)=3=singular matrix
	Variable/G V_FitQuitReason=0		//0=ok,1=maxiter,2=user stop,3=no chisq decrease
	
// don't use the auto-destination with no flag, it doesn't appear to work correctly
// dispatch the fit
	//	FuncFit/H="11110111111"/NTHR=0 Cylinder2D_D :cyl2d_c_txt:coef_Cyl2D_D  :cyl2d_c_txt:cyl2d_c_txt_i /X={:cyl2d_c_txt:cyl2d_c_txt_qy,:cyl2d_c_txt:cyl2d_c_txt_qx} /W=:cyl2d_c_txt:sw /I=1 /M=:cyl2d_c_txt:mask /D 

	do
		if(useRes && useEps && useCursors && useConstr)		//do it all
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps /C=constr
			break
		endif
		
		if(useRes && useEps && useCursors)		//no constr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps
			break
		endif
		
		if(useRes && useEps && useConstr)		//no crsr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps /C=constr
			break
		endif
		
		if(useRes && useCursors && useConstr)		//no eps
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D /C=constr
			break
		endif
		
		if(useRes && useCursors)		//no eps, no constr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D
			break
		endif
		
		if(useRes && useEps)		//no crsr, no constr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps
			break
		endif
	
		if(useRes && useConstr)		//no crsr, no eps
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D /C=constr
			break
		endif
		
		if(useRes)		//just res
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D
			break
		endif
		
/////	same as above, but all without useRes (no /STRC flag)
		if(useEps && useCursors && useConstr)		//do it all
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps /C=constr
			break
		endif
		
		if(useEps && useCursors)		//no constr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps
			break
		endif
		
		
		if(useEps && useConstr)		//no crsr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps /C=constr
			break
		endif
		
		if(useCursors && useConstr)		//no eps
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D /C=constr
			break
		endif
		
		if(useCursors)		//no eps, no constr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten[pcsr(A),pcsr(B)] /X={Qx,Qy} /M=mask /W=sw /I=1 /D
			break
		endif
		
		if(useEps)		//no crsr, no constr
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D /E=eps
			break
		endif
	
		if(useConstr)		//no crsr, no eps
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D /C=constr
			break
		endif
		
		//just a plain vanilla fit
			FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, inten /X={Qx,Qy} /M=mask /W=sw /I=1 /D
	
	while(0)
	
	// append the fit
	// need to manage duplicate copies
	// Don't plot the full curve if cursors were used (set fitYw to NaN on entry...)
//	String traces=TraceNameList("", ";", 1 )		//"" as first parameter == look on the target graph
//	if(strsearch(traces,"FitYw",0) == -1)
//		AppendToGraph FitYw vs xw
//	else
//		RemoveFromGraph FitYw
//		AppendToGraph FitYw vs xw
//	endif
//	ModifyGraph lsize(FitYw)=2,rgb(FitYw)=(0,0,0)
	
//	DoUpdate		//force update of table and graph with fitted values (why doesn't this work? - the table still does not update)
	
	// report the results (to the panel?)
	print "V_chisq = ",V_chisq
	print cw
	WAVE w_sigma
	print w_sigma
	String resultStr=""
		
	//now re-write the results
	sprintf resultStr,"Chi^2 = %g  Sqrt(X^2/N) = %g",V_chisq,sqrt(V_chisq/V_Npnts)
	resultStr = PadString(resultStr,63,0x20)
	GroupBox grpBox_2 title=resultStr
	ControlUpdate/W=WrapperPanel grpBox_2
	sprintf resultStr,"FitErr = %s : FitQuit = %s",W_ErrorMessage(V_FitError),W_QuitMessage(V_FitQuitReason)
	resultStr = PadString(resultStr,63,0x20)
	GroupBox grpBox_3 title=resultStr
	ControlUpdate/W=WrapperPanel grpBox_3
	
	Variable yesSave=0,yesReport=0
	ControlInfo/W=WrapperPanel check_4
	yesReport = V_Value
	ControlInfo/W=WrapperPanel check_5
	yesSave = V_Value
	
	
	if(yesReport)
		String parStr=GetWavesDataFolder(cw,1)+ WaveList("*param*"+suffix, "", "TEXT:1," )		//this is *hopefully* one wave
		String topGraph= TopGizmoWindow()  	//this is the topmost Gizmo (XOP) window
		
		DoUpdate		//force an update of the graph before making a copy of it for the report
	
		W_GenerateReport(funcStr,folderStr,$parStr,cw,yesSave,V_chisq,W_sigma,V_npnts,V_FitError,V_FitQuitReason,V_startRow,V_endRow,topGraph)
	endif
	
	SetDataFolder root:
	return(0)
End


// right now, there are only unsmeared models, but I want experimental points
// for the QxQy of the calculation - so get the folder string
Function Plot2DFunctionButtonProc(ba) : ButtonControl
	STRUCT WMButtonAction &ba

	String folderStr,funcStr,coefStr,cmdStr=""
	
	Variable killWhat=0		//kill nothing as default

	switch( ba.eventCode )
		case 2: // mouse up
			ControlInfo/W=WrapperPanel popup_0
			folderStr=S_Value
			
			ControlInfo/W=WrapperPanel popup_1
			funcStr=S_Value
			
			// check for smeared or smeared function
//			if(stringmatch(funcStr, "Smear*" )==1)
				//it's a smeared model
				// check for the special case of RPA that has an extra parameter
//				if(strsearch(funcStr, "RPAForm", 0 ,0) == -1)
					sprintf cmdStr, "Plot%s(\"%s\")",funcStr,folderStr		//not RPA
//				else
//					sprintf cmdStr, "Plot%s(\"%s\",)",funcStr,folderStr		//yes RPA, leave a comma for input
//				endif
//			else
//				// it's not, 			
//				sprintf cmdStr, "Plot%s()",funcStr
//			endif
			
			//Print cmdStr
			Execute cmdStr
			
			//pop the function menu to set the proper coefficients
			DoWindow/F WrapperPanel
			STRUCT WMPopupAction pa
			pa.popStr = funcStr
			pa.eventcode = 2
			Function_PopMenuProc(pa)
	
			KillWhat = 2 		//kill just the table, leave the 2d visible for now
			KillTopGraphAndTable(killWhat)		// crude

			break
	endswitch

	return 0
End

// unused - all of this functionality has been added to the Wrapper Panel
Window Plot_2D_Controls() : Panel
	PauseUpdate; Silent 1		// building window...
	NewPanel /W=(950,44,1250,244)
	Button button0,pos={172,37},size={70,20},proc=LogToggle2DButtonProc,title="Log/Lin"
	Button button1,pos={146,9},size={100,20},proc=Plot2DButtonProc,title="Plot 2D Data"
	Button button2,pos={164,118},size={120,20},proc=Append2DModelButtonProc,title="Append Model"
	PopupMenu popup_1,pos={9,84},size={132,20},proc=Function_PopMenuProc,title="Function"
	PopupMenu popup_1,mode=1,popvalue="Cylinder2D",value= #"W_FunctionPopupList()"
	Button button3,pos={11,9},size={100,20},proc=Load2DDataButtonProc,title="Load 2D Data"
	Button button4,pos={164,161},size={120,20},proc=Do2DFitButtonProc,title="Do 2D Fit"
	Button button5,pos={164,85},size={120,20},proc=Plot2DFunctionButtonProc,title="Plot 2D Function"
EndMacro


Function/S TopGizmoWindow()
	Return(StringFromList(0,WinList("*",";","WIN:4096")))
end

////
//
// unused proc for testing
Proc Plot2DVsPointNumber(str)
	String str
	Prompt str,"Pick the data folder containing 2D data",popup,getAList(4)

	PauseUpdate; Silent 1		// building window...
	String fldrSav0= GetDataFolder(1)
	SetDataFolder $("root:"+str)
	Display /W=(241,352,810,842) $(str+"_i")
	SetDataFolder fldrSav0
	ModifyGraph mode=3
	ModifyGraph marker=19
	ModifyGraph lSize=2
	ModifyGraph rgb($(str+"_i"))=(0,0,0)
	ModifyGraph msize=1
	ModifyGraph grid=1
	ModifyGraph log(left)=1
	ModifyGraph mirror=2
	if(exists("root:"+str+":sw"))
		ErrorBars/T=0 $(str+"_i") Y,wave=($("root:"+str+":sw"),$("root:"+str+":sw"))
	endif
	SetDataFolder fldrSav0
EndMacro

// testing procedure, used when I had x,y swapped and was getting nonsensical results
//Macro CalculateChiSquared(str)
//	String str
//	Prompt str,"Pick the data folder containing 2D data",popup,getAList(4)
//
//
//	String fldrSav0= GetDataFolder(1)
//	SetDataFolder $("root:"+str)
//
//	Duplicate/O $(str+"_i") chi
//	chi = ((zwave_cyl2D_D - $(str+"_i"))/sw )^2
//	
//	chi = (mask == 1) ? chi : 0
//	
//	Print sum(chi,-inf,inf)
//	
//	SetDataFolder fldrSav0
//EndMacro


Function MakeBSMask(mask,rad)
	Wave mask
	Variable rad


// find the center based on the wave scaling
	Variable xCtr,yCtr,Qzero=0
	xCtr = (Qzero - DimOffset(Mask, 0))/DimDelta(Mask,0)
	yCtr = (Qzero - DimOffset(Mask, 1))/DimDelta(Mask,1)

	Print xctr,yctr

//	Variable center = sqrt(numpnts(mask))/2 -0.5

	mask = (sqrt((p-xCtr)^2+(q-yCtr)^2) < rad) ? 0 : 1

	Variable xDim, yDim
	xDim = DimSize(mask,0)
	yDim = DimSize(mask,1)
	mask[][0] = 0
	mask[][1] = 0
	mask[][yDim-2] = 0
	mask[][yDim-1] = 0
	mask[0][] = 0
	mask[1][] = 0
	mask[xDim-2][] = 0
	mask[xDim-1][] = 0
	
	Redimension/N=(xDim*yDim) mask		//now 1D
	
	
End