Added double support.

Fixed all known errors and warnings, with the exception of: tmpxft_000013d0_00000000-4_cudaMain.ptx, line 86; warning : Double is not supported. Demoting to float I'm not sure what is causing that, but it doesn't seem to be introducing any mathematical errors. If anybody has an idea, please let me know!

Added double support.
Fixed all known errors and warnings, with the exception of: tmpxft_000013d0_00000000-4_cudaMain.ptx, line 86; warning : Double is not supported. Demoting to float I'm not sure what is causing that, but it doesn't seem to be introducing any mathematical errors. If anybody has an idea, please let me know!
dmayerich
1 parent 212273d5
Showing 15 changed files with 289 additions and 466 deletions Show diff stats
BESSIK.CPP
BESSJY.CPP
CBESSJY.CPP
EstimateMaterial.cpp
FileIO.cpp
PerformanceData.h
README
SimulateSpectrum.cpp
cudaKK.h
cudaMain.cu
globals.h
interactivemie.h
interactivemie.ui
main.cpp
qtSpectrumDisplay.cpp
@@ -348,7 +348,7 @@ int bessikv(double v,double x,double &amp;vm,double *iv,double *kv,
     double *ivp,double *kvp)
 {
     double x2,v0,piv,vt,a1,v0p,gap,r,bi0,ca,sum;
-    double f,f0,f1,f2,ct,cs,wa,gan,ww,w0,v0n;
+    double f,f1,f2,ct,cs,wa,gan,ww,w0,v0n;
     double r1,r2,bk0,bk1,bk2,a2,cb;
     int n,k,kz,m;
@@ -274,7 +274,7 @@ int msta1(double x,int mp)
     n1 = n0+5;
     f1 = 0.5*log10(6.28*n1)-n1*log10(1.36*a0/n1)-mp;
     for (i=0;i<20;i++) {
-        nn = n1-(n1-n0)/(1.0-f0/f1);
+        nn = (int)(n1-(n1-n0)/(1.0-f0/f1));
         f = 0.5*log10(6.28*nn)-nn*log10(1.36*a0/nn)-mp;
         if (abs(nn-n1) < 1) break;
         n0 = n1;
@@ -305,7 +305,7 @@ int msta2(double x,int n,int mp)
     n1 = n0+5;
     f1 = 0.5*log10(6.28*n1)-n1*log10(1.36*a0/n1)-obj;
     for (i=0;i<20;i++) {
-        nn = n1-(n1-n0)/(1.0-f0/f1);
+        nn = (int)(n1-(n1-n0)/(1.0-f0/f1));
         f = 0.5*log10(6.28*nn)-nn*log10(1.36*a0/nn)-obj;
         if (abs(nn-n1) < 1) break;
         n0 = n1;
@@ -404,7 +404,7 @@ int bessjyna(int n,double x,int &amp;nm,double *jn,double *yn,
 int bessjynb(int n,double x,int &nm,double *jn,double *yn,
     double *jnp,double *ynp)
 {
-    double t1,t2,f,f0,f1,f2,bj0,bj1,bjk,by0,by1,cu,s0,su,sv;
+    double t1,t2,f,f1,f2,bj0,bj1,bjk,by0,by1,cu,s0,su,sv;
     double ec,bs,byk,p0,p1,q0,q1;
     static double a[] = {
         -0.7031250000000000e-1,
@@ -536,7 +536,7 @@ int bessjyv(double v,double x,double &amp;vm,double *jv,double *yv,
 {
     double v0,vl,vg,vv,a,a0,r,x2,bjv0,bjv1,bjvl,f,f0,f1,f2;
     double r0,r1,ck,cs,cs0,cs1,sk,qx,px,byv0,byv1,rp,xk,rq;
-    double b,ec,w0,w1,bjy0,bjy1,bju0,bju1,pv0,pv1,byvk;
+    double b,ec,w0,w1,bju0,bju1,pv0,pv1,byvk;
     int j,k,l,m,n,kz;
     x2 = x*x;
@@ -189,7 +189,7 @@ int cbessjyna(int n,complex&lt;double&gt; z,int &amp;nm,complex&lt;double&gt; *cj,
     complex<double> cs,cg0,cg1,cyk,cyl1,cyl2,cylk,cp11,cp12,cp21,cp22;
     complex<double> ch0,ch1,ch2;
     double a0,yak,ya1,ya0,wa;
-    int m,k,kz,lb,lb0;
+    int m,k,lb,lb0;
     if (n < 0) return 1;
     a0 = abs(z);
 #include "globals.h"
 #define PI 3.14159
-float CalculateError(float* E)
+double CalculateError(double* E)
 {
 	//Calculate the error between the Reference Spectrum and the Simulated Spectrum
-	float sumE = 0.0;
+	double sumE = 0.0;
 	int nVals = RefSpectrum[currentSpec].size();
-	float nu;
+	double nu;
 	for(int i=0; i<nVals; i++)
 	{
 		nu = RefSpectrum[currentSpec][i].nu;
@@ -17,16 +17,16 @@ float CalculateError(float* E)
 	return sumE/nVals;
 }
-void EstimateK(float* E)
+void EstimateK(double* E)
 {
 	int nVals = RefSpectrum[currentSpec].size();
-	float nuStart = RefSpectrum[currentSpec].front().nu;
-	float nuEnd = RefSpectrum[currentSpec].back().nu;
+	double nuStart = RefSpectrum[currentSpec].front().nu;
+	double nuEnd = RefSpectrum[currentSpec].back().nu;
-	float r = radius/10000.0;
-	float nu;
-	float dNu = (nuEnd - nuStart)/(nVals-1);
-	float eScale;
+	double r = radius/10000.0;
+	double nu;
+	double dNu = (nuEnd - nuStart)/(nVals-1);
+	double eScale;
 	for(int i=0; i<nVals; i++)
 	{
 		nu = nuStart + i*2;
@@ -50,7 +50,7 @@ void EstimateMaterial()
 	//insert the default material properties
 	SpecPair temp;
-	for(int s=0; s<RefSpectrum[currentSpec].size(); s++)
+	for(int s=0; s<(int)RefSpectrum[currentSpec].size(); s++)
 	{
 		//the real part of the IR is the user-specified baseline IR
 		temp.nu = RefSpectrum[currentSpec][s].nu;
@@ -63,17 +63,17 @@ void EstimateMaterial()
 	//allocate space to store the list of error values
-	float* E = (float*)malloc(sizeof(float) * RefSpectrum[currentSpec].size());
+	double* E = (double*)malloc(sizeof(double) * RefSpectrum[currentSpec].size());
 	//copy the absorbance values into a linear array
-	float* k = (float*)malloc(sizeof(float) * EtaK.size());
-	float* n = (float*)malloc(sizeof(float) * EtaN.size());
+	double* k = (double*)malloc(sizeof(double) * EtaK.size());
+	double* n = (double*)malloc(sizeof(double) * EtaN.size());
 	//iterate to solve for both n and k
-	float sumE = 99999.9;
-	int i=0;
+	double sumE = 99999.9;
+	int j=0;
 	//clear the console
 	system("cls");
-	while(sumE > minMSE && i < maxFitIter)
+	while(sumE > minMSE && j < maxFitIter)
 	{	
 		//simulate a spectrum based on the current IR		
 		SimulateSpectrum();
@@ -86,13 +86,13 @@ void EstimateMaterial()
 		//use Kramers-Kronig to compute n
-		for(int i=0; i<EtaK.size(); i++)
+		for(unsigned int i=0; i<EtaK.size(); i++)
 			k[i] = EtaK[i].A;
 		cudaKramersKronig(n, k, EtaK.size(), EtaK.front().nu, EtaK.back().nu, baseIR);
 		//copy the real part of the index of refraction into the vector
 		EtaN.clear();
-		for(int i=0; i<EtaK.size(); i++)
+		for(int i=0; i<(int)EtaK.size(); i++)
 		{
 			temp.nu =  EtaK[i].nu;
 			temp.A = n[i];
@@ -100,7 +100,7 @@ void EstimateMaterial()
 		}
 		cout<<"    E = "<<sumE<<endl;
-		i++;
+		j++;
 		//SaveSpectrum(n, nVals, "simNj.txt");
 		//SaveSpectrum(k, nVals, "simKj.txt");
 		//SaveSpectrum(simSpec, nVals, "simSpec.txt");
@@ -23,11 +23,11 @@ vector&lt;SpecPair&gt; LoadSpectrum(string filename)
 	}
 	//compute the minimum and maximum input wavenumbers
-	float inMin = S.front().nu;
-	float inMax = S.back().nu;
+	double inMin = S.front().nu;
+	double inMax = S.back().nu;
-	int nuMin = ceil(inMin);
-	int nuMax = floor(inMax);
+	int nuMin = (int)ceil(inMin);
+	int nuMax = (int)floor(inMax);
 	//make sure both are either even or odd
 	if(nuMin % 2 != nuMax % 2)
@@ -39,7 +39,7 @@ vector&lt;SpecPair&gt; LoadSpectrum(string filename)
 	//allocate space for the spectrum
 	vector<SpecPair> outSpec;
-	float nu, highVal, lowVal, a;
+	double nu, highVal, lowVal, a;
 	int j=1;
 	for(int i=0; i<nVals; i++)
 	{
@@ -52,7 +52,7 @@ vector&lt;SpecPair&gt; LoadSpectrum(string filename)
 		else
 		{
 			//move to the correct position in the input array
-			while(j < S.size()-1 && S[j].nu <= nu)
+			while(j < (int)S.size()-1 && S[j].nu <= nu)
 				j++;
 			lowVal = S[j-1].nu;
@@ -88,7 +88,7 @@ vector&lt;SpecPair&gt; SetReferenceSpectrum(char* text)
 void SaveK(string fileName)
 {
 	ofstream outFile(fileName.c_str());
-	for(int i=0; i<EtaK.size(); i++)
+	for(unsigned int i=0; i<EtaK.size(); i++)
 	{
 		outFile<<EtaK[i].nu<<"          ";
 		outFile<<EtaK[i].A<<endl;
@@ -99,7 +99,7 @@ void SaveK(string fileName)
 void SaveN(string fileName)
 {
 	ofstream outFile(fileName.c_str());
-	for(int i=0; i<EtaN.size(); i++)
+	for(unsigned int i=0; i<EtaN.size(); i++)
 	{
 		outFile<<EtaN[i].nu<<"          ";
 		outFile<<EtaN[i].A<<endl;
@@ -110,7 +110,7 @@ void SaveN(string fileName)
 void SaveSimulation(string fileName)
 {
 	ofstream outFile(fileName.c_str());
-	for(int i=0; i<SimSpectrum.size(); i++)
+	for(unsigned int i=0; i<SimSpectrum.size(); i++)
 	{
 		outFile<<SimSpectrum[i].nu<<"          ";
 		outFile<<SimSpectrum[i].A<<endl;
@@ -76,7 +76,7 @@ public:
 	void EndTimer( int type ) {
 		LARGE_INTEGER endTime;
 		QueryPerformanceCounter( &endTime );
-		double t = endTime.QuadPart - startTime[type].QuadPart;
+		double t = (double)(endTime.QuadPart - startTime[type].QuadPart);
 		//unsigned int t = GetTickCount() - startTime[type];
 		if ( t < minTime[type] ) minTime[type] = t;
 		if ( t > maxTime[type] ) maxTime[type] = t;
+I've just added support for double-precision values. This allows simulation of extremely small (nano-scale) particles, however a GPU with a compute capability of at least 1.3 is required.
+
 TrueEyes requires the following libraries:
 GLUT (OpenGL Utility Toolkit) http://www.opengl.org/resources/libraries/glut/
@@ -8,7 +8,7 @@ using namespace std;
 #define pi 3.14159
-typedef complex<float> scComplex;
+typedef complex<double> scComplex;
 int cbessjyva(double v,complex<double> z,double &vm,complex<double>*cjv,
     complex<double>*cyv,complex<double>*cjvp,complex<double>*cyvp);
@@ -33,7 +33,7 @@ double Yl_neg(double x)
 	return ( sqrt(2.0/pi) * sin(x) )/sqrt(x);
 }
-void computeB(complex<float>* B, float radius, complex<double> refIndex, float lambda, int Nl)
+void computeB(complex<double>* B, double radius, complex<double> refIndex, double lambda, int Nl)
 {
 	double k = (2*pi)/lambda;
 	int b = 2;
@@ -111,9 +111,9 @@ void computeB(complex&lt;float&gt;* B, float radius, complex&lt;double&gt; refIndex, float l
 		numer = j_kr*j_d_knr*n - j_knr*j_d_kr;
 		denom = j_knr*h_d_kr - h_kr*j_d_knr*n;
-		complex<double> temp =  numer/denom;
+		B[l] =  numer/denom;
-		B[l] = scComplex(temp.real(), temp.imag());
+		//B[l] = scComplex(temp.real(), temp.imag());
 		//cout<<B[l]<<endl;
 	}
@@ -127,7 +127,7 @@ void computeB(complex&lt;float&gt;* B, float radius, complex&lt;double&gt; refIndex, float l
 	free(cyvp);
 }
-void Legendre(float* P, float x, int Nl)
+void Legendre(double* P, double x, int Nl)
 {
 	//computes the legendre polynomials from orders 0 to Nl-1
 	P[0] = 1;
@@ -140,7 +140,7 @@ void Legendre(float* P, float x, int Nl)
 }
-complex<float> integrateUi(float cAngleI, float cAngleO, float oAngleI, float oAngleO, float M = 2*pi)
+complex<double> integrateUi(double cAngleI, double cAngleO, double oAngleI, double oAngleO, double M = 2*pi)
 {
 	/*This function integrates the incident field of magnitude M in the far zone
 	in order to evaluate the field at the central pixel of a detector.
@@ -150,20 +150,20 @@ complex&lt;float&gt; integrateUi(float cAngleI, float cAngleO, float oAngleI, float oA
 	oNAo = objective outer angle
 	M = field magnitude*/
-	float alphaIn = max(cAngleI, oAngleI);
-	float alphaOut = min(cAngleO,oAngleO);
+	double alphaIn = max(cAngleI, oAngleI);
+	double alphaOut = min(cAngleO,oAngleO);
-	complex<float> Ui;
+	complex<double> Ui;
 	if(alphaIn > alphaOut)
-		Ui = complex<float>(0.0, 0.0);
+		Ui = complex<double>(0.0, 0.0);
 	else
-		Ui = complex<float>(M * 2 * pi * (cos(alphaIn) - cos(alphaOut)), 0.0f);
+		Ui = complex<double>(M * 2 * pi * (cos(alphaIn) - cos(alphaOut)), 0.0f);
 	return Ui;
 }
-void computeCondenserAlpha(float* alpha, int Nl, float cAngleI, float cAngleO)
+void computeCondenserAlpha(double* alpha, int Nl, double cAngleI, double cAngleO)
 {
 	/*This function computes the condenser integral in order to build the field of incident light
 	alpha = list of Nl floating point values representing the condenser alpha as a function of l
@@ -171,9 +171,9 @@ void computeCondenserAlpha(float* alpha, int Nl, float cAngleI, float cAngleO)
 	cAngleI, cAngleO = inner and outer condenser angles (inner and outer NA)*/
 	//compute the Legendre polynomials for the condenser aperature
-	float* PcNAo = (float*)malloc(sizeof(float)*(Nl+1));
+	double* PcNAo = (double*)malloc(sizeof(double)*(Nl+1));
 	Legendre(PcNAo, cos(cAngleO), Nl+1);
-	float* PcNAi = (float*)malloc(sizeof(float)*(Nl+1));
+	double* PcNAi = (double*)malloc(sizeof(double)*(Nl+1));
 	Legendre(PcNAi, cos(cAngleI), Nl+1);
 	for(int l=0; l<Nl; l++)
@@ -189,8 +189,8 @@ void computeCondenserAlpha(float* alpha, int Nl, float cAngleI, float cAngleO)
 }
-complex<float> integrateUs(float r, float lambda, complex<float> eta, 
-						   float cAngleI, float cAngleO, float oAngleI, float oAngleO, float M = 2*pi)
+complex<double> integrateUs(double r, double lambda, complex<double> eta, 
+						   double cAngleI, double cAngleO, double oAngleI, double oAngleO, double M = 2*pi)
 {
 	/*This function integrates the incident field of magnitude M in the far zone
 	in order to evaluate the field at the central pixel of a detector.
@@ -204,20 +204,20 @@ complex&lt;float&gt; integrateUs(float r, float lambda, complex&lt;float&gt; eta,
 	M = field magnitude*/
 	//compute the required number of orders
-	float k = 2*pi/lambda;
-	int Nl = ceil( k + 4 * exp(log(k*r)/3) + 3 );
+	double k = 2*pi/lambda;
+	int Nl = (int)ceil( k + 4 * exp(log(k*r)/3) + 3 );
 	//compute the material coefficients B
-	complex<float>* B = (complex<float>*)malloc(sizeof(complex<float>)*Nl);
+	complex<double>* B = (complex<double>*)malloc(sizeof(complex<double>)*Nl);
 	//compute the Legendre polynomials for the condenser and objective aperatures
-	float* PcNAo = (float*)malloc(sizeof(float)*(Nl+1));
+	double* PcNAo = (double*)malloc(sizeof(double)*(Nl+1));
 	Legendre(PcNAo, cos(cAngleO), Nl+1);
-	float* PcNAi = (float*)malloc(sizeof(float)*(Nl+1));
+	double* PcNAi = (double*)malloc(sizeof(double)*(Nl+1));
 	Legendre(PcNAi, cos(cAngleI), Nl+1);
-	float* PoNAo = (float*)malloc(sizeof(float)*(Nl+1));
+	double* PoNAo = (double*)malloc(sizeof(double)*(Nl+1));
 	Legendre(PoNAo, cos(oAngleO), Nl+1);
-	float* PoNAi = (float*)malloc(sizeof(float)*(Nl+1));
+	double* PoNAi = (double*)malloc(sizeof(double)*(Nl+1));
 	Legendre(PoNAi, cos(oAngleI), Nl+1);
 	//store the index of refraction;
@@ -227,10 +227,10 @@ complex&lt;float&gt; integrateUs(float r, float lambda, complex&lt;float&gt; eta,
 	computeB(B, r, IR, lambda, Nl);
 	//aperature terms for the condenser (alpha) and objective (beta)
-	float alpha;
-	float beta;
-	float c;
-	complex<float> Us(0.0, 0.0);
+	double alpha;
+	double beta;
+	double c;
+	complex<double> Us(0.0, 0.0);
 	for(int l=0; l<Nl; l++)
 	{
@@ -266,14 +266,14 @@ void pointSpectrum()
 	//clear the previous spectrum
 	SimSpectrum.clear();
-	float dNu = 2.0f;
-	float lambda;
+	double dNu = 2.0f;
+	double lambda;
 	//compute the angles based on NA
-	float cAngleI = asin(cNAi);
-	float cAngleO = asin(cNAo);
-	float oAngleI = asin(oNAi);
-	float oAngleO = asin(oNAo);
+	double cAngleI = asin(cNAi);
+	double cAngleO = asin(cNAo);
+	double oAngleI = asin(oNAi);
+	double oAngleO = asin(oNAo);
 	//implement a reflection-mode system if necessary
 	if(opticsMode == ReflectionOpticsType){
@@ -288,33 +288,33 @@ void pointSpectrum()
 	}
 	//integrate the incident field at the detector position
-	complex<float> Ui = integrateUi(cAngleI, cAngleO, oAngleI, oAngleO, 2*pi);
-	float I0 = Ui.real() * Ui.real() + Ui.imag() * Ui.imag();
+	complex<double> Ui = integrateUi(cAngleI, cAngleO, oAngleI, oAngleO, 2*pi);
+	double I0 = Ui.real() * Ui.real() + Ui.imag() * Ui.imag();
 	I0 *= scaleI0;
-	float I;
+	//double I;
 	SpecPair temp;
-	float nu;
-	complex<float> eta;
-	complex<float> Us, U;
+	double nu;
+	complex<double> eta;
+	complex<double> Us, U;
-	float vecLen = 0.0;
-	for(int i=0; i<EtaK.size(); i++)
+	double vecLen = 0.0;
+	for(unsigned int i=0; i<EtaK.size(); i++)
 	{
 		nu = EtaK[i].nu;
 		lambda = 10000.0f/nu;
 		if(applyMaterial)
-			eta = complex<float>(EtaN[i].A, EtaK[i].A);
+			eta = complex<double>(EtaN[i].A, EtaK[i].A);
 		else
-			eta = complex<float>(baseIR, 0.0);
+			eta = complex<double>(baseIR, 0.0);
 		//integrate the scattered field at the detector position
 		Us = integrateUs(radius, lambda, eta, cAngleI, cAngleO, oAngleI, oAngleO, 2*pi);
 		U = Us + Ui;
-		float I = U.real() * U.real() + U.imag() * U.imag();
+		double I = U.real() * U.real() + U.imag() * U.imag();
 		temp.nu = nu;
@@ -332,202 +332,13 @@ void pointSpectrum()
 	vecLen = sqrt(vecLen);
 	if(dispNormalize)
-		for(int i=0; i<SimSpectrum.size(); i++)
+		for(unsigned int i=0; i<SimSpectrum.size(); i++)
 			SimSpectrum[i].A = (SimSpectrum[i].A / vecLen) * dispNormFactor;
 	PD.EndTimer(SIMULATE_SPECTRUM);
 }
-/*
-complex<float> sampleUs(complex<float>* B, float* Alpha, int Nl, float r, 
-						   float cAngleI, float cAngleO, float theta, float M = 2*pi)
-{
-	/*This function takes a point sample of the scattered field in the far zone
-	in order to evaluate the field at the central pixel of a detector.
-	r = sphere radius
-	lambda = wavelength
-	eta = index of refraction
-	cNAi = condenser inner NA
-	cNAo = condenser outer NA
-	theta = angle of the sample
-	M = field magnitude*/
-
-/*
-	//compute the material coefficients B
-	//complex<float>* B = (complex<float>*)malloc(sizeof(complex<float>)*Nl);
-
-	//compute the Legendre polynomials for theta (at the objective)
-	float* Ptheta = (float*)malloc(sizeof(float)*(Nl+1));
-	Legendre(Ptheta, cos(theta), Nl+1);
-
-	//complex<double> IR(eta.real(), eta.imag());
-
-	//aperature terms for the condenser (alpha) and objective (beta)
-	float beta;
-	float c;
-	complex<float> Us(0.0, 0.0);
-
-	for(int l=0; l<Nl; l++)
-	{
-
-		complex<float> numer(0.0, -(l*pi)/2.0);
-		Us += B[l] * exp(numer) * Ptheta[l] * Alpha[l] * pow(complex<float>(0.0, 1.0), l);
-		
-			
-	}
-	//printf("Ptheta: %f\n", Ptheta[Nl-1]);
-
-	return Us;
-
-}*/
-
-
-/*
-void detectorSpectrum(int numSamples)
-{
-	//integrate across the objective aperature and calculate the resulting intensity on a detector
-	PD.StartTimer(SIMULATE_SPECTRUM);
-	//clear the previous spectrum
-	SimSpectrum.clear();
-
-	float dNu = 2.0f;
-	float lambda;
-	
-	//compute the angles based on NA
-	float cAngleI = asin(cNAi);
-	float cAngleO = asin(cNAo);
-	float oAngleI = asin(oNAi);
-	float oAngleO = asin(oNAo);
-
-	//implement a reflection-mode system if necessary
-	if(opticsMode == ReflectionOpticsType){
-		
-		//set the condenser to match the objective
-		cAngleI = oAngleI;
-		cAngleO = oAngleO;
-
-		//invert the objective
-		oAngleO = pi - cAngleI;
-		oAngleI = pi - cAngleO;
-	}
-
-	//compute Nl (maximum order of the spectrum)
-	//****************************************************************************
-	float maxNu = EtaK.back().nu;
-	float maxLambda = 10000.0f/maxNu;
-	float k = 2*pi/maxLambda;
-	int Nl = ceil( k + 4 * exp(log(k*radius)/3) + 3 );
-	int nLambda = EtaK.size();
-
-	//compute alpha (condenser integral)
-	//****************************************************************************
-	//compute the Legendre polynomials for the condenser aperature
-	float* PcNAo = (float*)malloc(sizeof(float)*(Nl+1));
-	Legendre(PcNAo, cos(cAngleO), Nl+1);
-	float* PcNAi = (float*)malloc(sizeof(float)*(Nl+1));
-	Legendre(PcNAi, cos(cAngleI), Nl+1);
-
-	//allocate space for the alpha array
-	float* alpha = (float*)malloc(sizeof(float)*(Nl + 1));
-	computeCondenserAlpha(alpha, Nl, cAngleI, cAngleO);
-	
-	for(int l=0; l<Nl; l++)
-	{
-		//integration term
-		if(l == 0)
-			alpha[l] = -PcNAo[l+1] + PcNAo[0] + PcNAi[l+1] - PcNAi[0];
-		else
-			alpha[l] = -PcNAo[l+1] + PcNAo[l-1] + PcNAi[l+1] - PcNAi[l-1];
-
-		alpha[l] *= 2 * pi;
-	}
-
-	//compute the information based on wavelength and sphere
-
-	//evaluate the incident field intensity
-	float I0 = 0.0;
-	float theta;
-	float dTheta = (oAngleO - oAngleI)/numSamples;
-	complex<float> Ui;
-
-	Ui = integrateUi(cAngleI, cAngleO, oAngleI, oAngleO, 2*pi);
-	I0 = Ui.real()*2*pi;
-
-	float I;
-	SpecPair temp;
-	float nu;
-	complex<float> eta;
-	complex<float> Us, U;
-	
-	
-
-	float vecLen = 0.0;
-	for(int i=0; i<EtaK.size(); i++)
-	{
-		//compute information based on wavelength and material
-		nu = EtaK[i].nu;
-		lambda = 10000.0f/nu;
-		if(applyMaterial)
-			eta = complex<float>(EtaN[i].A, EtaK[i].A);
-		else
-			eta = complex<float>(baseIR, 0.0);
-
-		//allocate memory for the scattering coefficients
-		complex<float>* B = (complex<float>*)malloc(sizeof(complex<float>)*Nl);		
-		
-		complex<double> IR(eta.real(), eta.imag());
-		computeB(B, radius, IR, lambda, Nl);
-
-
-		//integrate the scattered field at the detector position
-		I = 0.0;
-		
-		for(int iTheta = 0; iTheta < numSamples; iTheta++)
-		{
-			theta = oAngleI + iTheta * dTheta;
-			Us = sampleUs(B, alpha, Nl, radius, cAngleI, cAngleO, theta, 2*pi);
-			
-
-			//calculate the intensity and add
-			if(theta >= cAngleI && theta <= cAngleO)
-				U = Us + 2*(float)pi;
-			else
-				U = Us;
-
-			I += (U.real() * U.real() + U.imag() * U.imag()) * sin(theta) * 2 * pi * dTheta;
-			
-		}
-		
-		temp.nu = nu;
-
-		if(i == 0)
-			printf("I: %f        I0: %f\n", I, I0);
-
-		//set the spectrum value based on the current display type
-		if(dispSimType == AbsorbanceSpecType)
-			temp.A = -log10(I/I0);
-		else
-			temp.A = I;
-
-		if(dispNormalize)
-			vecLen += temp.A * temp.A;
-		//temp.A = Us.real();
-		SimSpectrum.push_back(temp);	
-
-		free(B);
-	}
-	vecLen = sqrt(vecLen);
-
-	if(dispNormalize)
-		for(int i=0; i<SimSpectrum.size(); i++)
-			SimSpectrum[i].A = (SimSpectrum[i].A / vecLen) * dispNormFactor;
-
-	free(alpha);
-
-	PD.EndTimer(SIMULATE_SPECTRUM);
-}*/
-
-void updateSpectrum(float* I, float I0, int n)
+void updateSpectrum(double* I, double I0, int n)
 {
 	SimSpectrum.clear();
 	SpecPair temp;
@@ -547,7 +358,7 @@ void updateSpectrum(float* I, float I0, int n)
 	}
 }
-void computeCassegrainAngles(float& cAngleI, float& cAngleO, float& oAngleI, float& oAngleO)
+void computeCassegrainAngles(double& cAngleI, double& cAngleO, double& oAngleI, double& oAngleO)
 {
 	//compute the angles based on NA
 	cAngleI = asin(cNAi);
@@ -572,30 +383,30 @@ void computeCassegrainAngles(float&amp; cAngleI, float&amp; cAngleO, float&amp; oAngleI, flo
 int computeNl()
 {
-	float maxNu = EtaK.back().nu;
-	float maxLambda = 10000.0f/maxNu;
-	float k = 2*pi/maxLambda;
-	int Nl = ceil( k + 4 * exp(log(k*radius)/3) + 3 );
+	double maxNu = EtaK.back().nu;
+	double maxLambda = 10000.0f/maxNu;
+	double k = 2*pi/maxLambda;
+	int Nl = (int)ceil( k + 4 * exp(log(k*radius)/3) + 3 );
 	return Nl;
 }
-void computeBArray(complex<float>* B, int Nl, int nLambda)
+void computeBArray(complex<double>* B, int Nl, int nLambda)
 {
-	float nu;
-	complex<float> eta;
-	float* Lambda = (float*)malloc(sizeof(float) * nLambda);
+	double nu;
+	complex<double> eta;
+	double* Lambda = (double*)malloc(sizeof(double) * nLambda);
 	//for each wavenumber nu
-	for(int i=0; i<EtaK.size(); i++)
+	for(unsigned int i=0; i<EtaK.size(); i++)
 	{
 		//compute information based on wavelength and material
 		nu = EtaK[i].nu;
 		Lambda[i] = 10000.0f/nu;
 		if(applyMaterial)
-			eta = complex<float>(EtaN[i].A, EtaK[i].A);
+			eta = complex<double>(EtaN[i].A, EtaK[i].A);
 		else
-			eta = complex<float>(baseIR, 0.0);
+			eta = complex<double>(baseIR, 0.0);
 		//allocate memory for the scattering coefficients
 		//complex<float>* B = (complex<float>*)malloc(sizeof(complex<float>)*Nl);		
@@ -605,14 +416,13 @@ void computeBArray(complex&lt;float&gt;* B, int Nl, int nLambda)
 	}
 }
-void computeOpticalParameters(float& cAngleI, float& cAngleO, float& oAngleI, float& oAngleO, float& I0, float* alpha, int Nl)
+void computeOpticalParameters(double& cAngleI, double& cAngleO, double& oAngleI, double& oAngleO, double& I0, double* alpha, int Nl)
 {
 	computeCassegrainAngles(cAngleI, cAngleO, oAngleI, oAngleO);	
 	//evaluate the incident field intensity
 	I0 = 0.0;
-	float theta;
-	complex<float> Ui;
+	complex<double> Ui;
 	Ui = integrateUi(cAngleI, cAngleO, oAngleI, oAngleO, 2*pi);
 	I0 = Ui.real()*2*pi;
@@ -631,24 +441,24 @@ void gpuDetectorSpectrum(int numSamples)
 	//compute Nl (maximum order of the spectrum)
 	int Nl = computeNl();
-	float* alpha = (float*)malloc(sizeof(float)*(Nl + 1));
-	float cAngleI, cAngleO, oAngleI, oAngleO, I0;
+	double* alpha = (double*)malloc(sizeof(double)*(Nl + 1));
+	double cAngleI, cAngleO, oAngleI, oAngleO, I0;
 	computeOpticalParameters(cAngleI, cAngleO, oAngleI, oAngleO, I0, alpha, Nl);
 	//allocate space for a list of wavelengths
 	int nLambda = EtaK.size();
 	//allocate space for the 2D array (Nl x nu) of scattering coefficients
-	complex<float>* B = (complex<float>*)malloc(sizeof(complex<float>) * Nl * nLambda);
+	complex<double>* B = (complex<double>*)malloc(sizeof(complex<double>) * Nl * nLambda);
 	computeBArray(B, Nl, nLambda);
 	//allocate temporary space for the spectrum
-	float* I = (float*)malloc(sizeof(float) * EtaK.size());
+	double* I = (double*)malloc(sizeof(double) * EtaK.size());
 	//compute the spectrum on the GPU
 	PD.StartTimer(SIMULATE_GPU);
-	cudaComputeSpectrum(I, (float*)B, alpha, Nl, nLambda, oAngleI, oAngleO, cAngleI, cAngleO, numSamples);
+	cudaComputeSpectrum(I, (double*)B, alpha, Nl, nLambda, oAngleI, oAngleO, cAngleI, cAngleO, numSamples);
 	PD.EndTimer(SIMULATE_GPU);
 	updateSpectrum(I, I0, nLambda);
@@ -666,44 +476,44 @@ void SimulateSpectrum()
 		//detectorSpectrum(objectiveSamples);
 }
-float absorbanceDistortion(){
+double absorbanceDistortion(){
 	//compute the mean of the spectrum
-	float sumSim = 0.0;
-	for(int i=0; i<SimSpectrum.size(); i++)
+	double sumSim = 0.0;
+	for(unsigned int i=0; i<SimSpectrum.size(); i++)
 	{
 		sumSim += SimSpectrum[i].A;
 	}
-	float meanSim = sumSim/SimSpectrum.size();
+	double meanSim = sumSim/SimSpectrum.size();
 	//compute the distortion (MSE from the mean)
-	float sumSE = 0.0;
-	for(int i=0; i<SimSpectrum.size(); i++)
+	double sumSE = 0.0;
+	for(unsigned int i=0; i<SimSpectrum.size(); i++)
 	{
 		sumSE += pow(SimSpectrum[i].A - meanSim, 2);
 	}
-	float MSE = sumSE / SimSpectrum.size();
+	double MSE = sumSE / SimSpectrum.size();
 	return MSE;
 }
-float intensityDistortion(){
+double intensityDistortion(){
 	//compute the magnitude of the spectrum
-	float sumSim = 0.0;
-	for(int i=0; i<SimSpectrum.size(); i++)
+	double sumSim = 0.0;
+	for(unsigned int i=0; i<SimSpectrum.size(); i++)
 	{
 		sumSim += SimSpectrum[i].A * SimSpectrum[i].A;
 	}
-	float magSim = sqrt(sumSim);
+	double magSim = sqrt(sumSim);
 	//compute the distortion (MSE from the mean)
-	float sumSE = 0.0;
-	for(int i=0; i<SimSpectrum.size(); i++)
+	double sumSE = 0.0;
+	for(unsigned int i=0; i<SimSpectrum.size(); i++)
 	{
 		sumSE += (SimSpectrum[i].A/magSim) * (1.0/SimSpectrum.size());
 	}
-	float MSE = sumSE;
+	double MSE = sumSE;
 	return MSE;
 }
@@ -712,7 +522,7 @@ void MinimizeDistortion(){
 	ofstream outFile("distortion.txt");
 	//set the parameters for the distortion simulation
-	float step = 0.001;
+	double step = 0.001;
 	oNAi = 0.2;
 	oNAo = 0.5;
@@ -721,28 +531,28 @@ void MinimizeDistortion(){
 	//compute Nl (maximum order of the spectrum)
 	int Nl = computeNl();
-	float* alpha = (float*)malloc(sizeof(float)*(Nl + 1));
-	float cAngleI, cAngleO, oAngleI, oAngleO, I0;
+	double* alpha = (double*)malloc(sizeof(double)*(Nl + 1));
+	double cAngleI, cAngleO, oAngleI, oAngleO, I0;
 	//allocate space for a list of wavelengths
 	int nLambda = EtaK.size();
 	//allocate temporary space for the spectrum
-	float* I = (float*)malloc(sizeof(float) * EtaK.size());
+	double* I = (double*)malloc(sizeof(double) * EtaK.size());
 	//calculate the material parameters
 	//allocate space for the 2D array (Nl x nu) of scattering coefficients
-	complex<float>* B = (complex<float>*)malloc(sizeof(complex<float>) * Nl * nLambda);
+	complex<double>* B = (complex<double>*)malloc(sizeof(complex<double>) * Nl * nLambda);
 	computeBArray(B, Nl, nLambda);
-	float D;
-	float e = 0.001;
-	for(float i=0.0; i<=oNAo-step; i+=step)
+	double D;
+	double e = 0.001;
+	for(double i=0.0; i<=oNAo-step; i+=step)
 	{
-		for(float o=oNAi+step; o<=1.0; o+=step)
+		for(double o=oNAi+step; o<=1.0; o+=step)
 		{
@@ -754,7 +564,7 @@ void MinimizeDistortion(){
 			computeOpticalParameters(cAngleI, cAngleO, oAngleI, oAngleO, I0, alpha, Nl);
 			//simulate the spectrum
-			cudaComputeSpectrum(I, (float*)B, alpha, Nl, nLambda, oAngleI, oAngleO, cAngleI, cAngleO, objectiveSamples);
+			cudaComputeSpectrum(I, (double*)B, alpha, Nl, nLambda, oAngleI, oAngleO, cAngleI, cAngleO, objectiveSamples);
 			updateSpectrum(I, I0, nLambda);
 			if(dispSimType == AbsorbanceSpecType)
-__device__ float g(float v0, float v1)
+__device__ double g(double v0, double v1)
 {
 	return (v0 + v1)*log(abs(v0+v1)) + (v0-v1)*log(abs(v0-v1));
 }
-__device__ float hfin(float v0, float v1, float dv)
+__device__ double hfin(double v0, double v1, double dv)
 {
-	float e = 0.001;
-	float t0 = g(v0+e, v1-dv)/dv;
-	float t1 = 2*g(v0+e, v1)/dv;
-	float t2 = g(v0+e, v1+dv)/dv;
+	double e = 0.001;
+	double t0 = g(v0+e, v1-dv)/dv;
+	double t1 = 2*g(v0+e, v1)/dv;
+	double t2 = g(v0+e, v1+dv)/dv;
 	return -1.0/PI * (t0 - t1 + t2);
 }
-__global__ void devKramersKronig(float* gpuN, float* gpuK, int numVals, float nuStart, float nuEnd, float nOffset)
+__global__ void devKramersKronig(double* gpuN, double* gpuK, int numVals, double nuStart, double nuEnd, double nOffset)
 {
 	int i = blockIdx.x * blockDim.x + threadIdx.x;
 	if(i >= numVals) return;
-	float nuDelta = (nuEnd - nuStart)/(numVals - 1);
+	double nuDelta = (nuEnd - nuStart)/(numVals - 1);
-	float nu = nuStart + i*nuDelta;
-	float n = 0.0;
-	float jNu;
-	float jK;
+	double nu = nuStart + i*nuDelta;
+	double n = 0.0;
+	double jNu;
+	double jK;
 	for(int j=1; j<numVals-1; j++)
 	{
 		jNu = nuStart + j*nuDelta;
@@ -35,55 +35,55 @@ __global__ void devKramersKronig(float* gpuN, float* gpuK, int numVals, float nu
 }
-void cudaKramersKronig(float* cpuN, float* cpuK, int nVals, float nuStart, float nuEnd, float nOffset)
+void cudaKramersKronig(double* cpuN, double* cpuK, int nVals, double nuStart, double nuEnd, double nOffset)
 {
-	float* gpuK;
-	HANDLE_ERROR(cudaMalloc(&gpuK, sizeof(float)*nVals));
-	HANDLE_ERROR(cudaMemcpy(gpuK, cpuK, sizeof(float)*nVals, cudaMemcpyHostToDevice));
-	float* gpuN;
-	HANDLE_ERROR(cudaMalloc(&gpuN, sizeof(float)*nVals));
+	double* gpuK;
+	HANDLE_ERROR(cudaMalloc(&gpuK, sizeof(double)*nVals));
+	HANDLE_ERROR(cudaMemcpy(gpuK, cpuK, sizeof(double)*nVals, cudaMemcpyHostToDevice));
+	double* gpuN;
+	HANDLE_ERROR(cudaMalloc(&gpuN, sizeof(double)*nVals));
 	dim3 block(BLOCK_SIZE*BLOCK_SIZE);
 	dim3 grid(nVals/block.x + 1);
 	devKramersKronig<<<grid, block>>>(gpuN, gpuK, nVals, nuStart, nuEnd, nOffset);
-	HANDLE_ERROR(cudaMemcpy(cpuN, gpuN, sizeof(float)*nVals, cudaMemcpyDeviceToHost));
+	HANDLE_ERROR(cudaMemcpy(cpuN, gpuN, sizeof(double)*nVals, cudaMemcpyDeviceToHost));
 	//free resources
 	HANDLE_ERROR(cudaFree(gpuK));
 	HANDLE_ERROR(cudaFree(gpuN));
 }
-__global__ void devComputeSpectrum(float* I, float2* B, float* alpha, int Nl, 
-								   int nSamples, float oThetaI, float oThetaO, float cThetaI, float cThetaO)
+__global__ void devComputeSpectrum(double* I, double2* B, double* alpha, int Nl, 
+								   int nSamples, double oThetaI, double oThetaO, double cThetaI, double cThetaO)
 {
 	int i = blockIdx.x * blockDim.x + threadIdx.x;
 	//compute the delta-theta value
-	float dTheta = (oThetaO - oThetaI)/nSamples;
+	double dTheta = (oThetaO - oThetaI)/nSamples;
 	//allocate space for the Legendre polynomials
-	float Ptheta[2];	
-
-	float cosTheta, theta;
-	cuComplex Us;
-	cuComplex UsSample;
-	cuComplex U;
-	cuComplex Ui;
-	Ui.x = 2*PI;
-	Ui.y = 0.0;
-	cuComplex numer;
+	double Ptheta[2];	
+
+	double cosTheta, theta;
+	cuDoubleComplex Us;
+	cuDoubleComplex UsSample;
+	cuDoubleComplex U;
+	//cuComplex Ui;
+	//Ui.x = 2*PI;
+	//Ui.y = 0.0;
+	cuDoubleComplex numer;
 	numer.x = 0.0;
-	cuComplex exp_numer;
-	cuComplex iL;
-	cuComplex imag;
+	cuDoubleComplex exp_numer;
+	cuDoubleComplex iL;
+	cuDoubleComplex imag;
 	imag.x = 0.0; imag.y = 1.0;
-	float realFac;
-	cuComplex complexFac;
-	float PlTheta;
-	float Isum = 0.0;
-	float maxVal = 0;
-	float val;
+	double realFac;
+	cuDoubleComplex complexFac;
+	double PlTheta;
+	double Isum = 0.0;
+	//float maxVal = 0;
+	//float val;
 	for(int iTheta = 0; iTheta < nSamples; iTheta++)
 	{
 		//calculate theta
@@ -131,12 +131,7 @@ __global__ void devComputeSpectrum(float* I, float2* B, float* alpha, int Nl,
 			//increment the imaginary exponent i^l
 			iL = cMult(iL, imag);
-			//val = cMag(Us);
-			//if(val > maxVal)
-			//	maxVal = val;
-
-			//Us += B[l] * exp(numer) * Ptheta[l] * alpha * M * pow(complex<float>(0.0, 1.0), l);
-			
+		
 		}
 		//sum the scattered and incident fields
@@ -150,20 +145,20 @@ __global__ void devComputeSpectrum(float* I, float2* B, float* alpha, int Nl,
 	I[i] = Isum;
 }
-void cudaComputeSpectrum(float* cpuI, float* cpuB, float* cpuAlpha,
-						 int Nl, int nLambda, float oThetaI, float oThetaO, float cThetaI, float cThetaO, int nSamples)
+void cudaComputeSpectrum(double* cpuI, double* cpuB, double* cpuAlpha,
+						 int Nl, int nLambda, double oThetaI, double oThetaO, double cThetaI, double cThetaO, int nSamples)
 {
 	//copy everything to the GPU
-	float2* gpuB;
-	HANDLE_ERROR(cudaMalloc(&gpuB, sizeof(float2) * nLambda * Nl));
-	HANDLE_ERROR(cudaMemcpy(gpuB, cpuB, sizeof(float2) * nLambda * Nl, cudaMemcpyHostToDevice));
+	double2* gpuB;
+	HANDLE_ERROR(cudaMalloc(&gpuB, sizeof(double2) * nLambda * Nl));
+	HANDLE_ERROR(cudaMemcpy(gpuB, cpuB, sizeof(double2) * nLambda * Nl, cudaMemcpyHostToDevice));
-	float* gpuAlpha;
-	HANDLE_ERROR(cudaMalloc(&gpuAlpha, sizeof(float) * Nl));
-	HANDLE_ERROR(cudaMemcpy(gpuAlpha, cpuAlpha, sizeof(float) * Nl, cudaMemcpyHostToDevice));
+	double* gpuAlpha;
+	HANDLE_ERROR(cudaMalloc(&gpuAlpha, sizeof(double) * Nl));
+	HANDLE_ERROR(cudaMemcpy(gpuAlpha, cpuAlpha, sizeof(double) * Nl, cudaMemcpyHostToDevice));
-	float* gpuI;
-	HANDLE_ERROR(cudaMalloc(&gpuI, sizeof(float) * nLambda));
+	double* gpuI;
+	HANDLE_ERROR(cudaMalloc(&gpuI, sizeof(double) * nLambda));
 	//call the kernel to compute the spectrum
@@ -171,10 +166,10 @@ void cudaComputeSpectrum(float* cpuI, float* cpuB, float* cpuAlpha,
 	dim3 grid(nLambda/block.x + 1);
 	//devComputeSpectrum
-	devComputeSpectrum<<<grid, block>>>(gpuI, (float2*)gpuB, gpuAlpha, Nl,
+	devComputeSpectrum<<<grid, block>>>(gpuI, (double2*)gpuB, gpuAlpha, Nl,
 										nSamples, oThetaI, oThetaO, cThetaI, cThetaO);
-	HANDLE_ERROR(cudaMemcpy(cpuI, gpuI, sizeof(float) * nLambda, cudaMemcpyDeviceToHost));
+	HANDLE_ERROR(cudaMemcpy(cpuI, gpuI, sizeof(double) * nLambda, cudaMemcpyDeviceToHost));
 	HANDLE_ERROR(cudaFree(gpuB));
 	HANDLE_ERROR(cudaFree(gpuAlpha));
@@ -5,45 +5,45 @@
 #define PI 3.14159
 #define BLOCK_SIZE 16
-__device__ cuComplex cMult(cuComplex a, cuComplex b)
+__device__ cuDoubleComplex cMult(cuDoubleComplex a, cuDoubleComplex b)
 {
-	cuComplex result;
+	cuDoubleComplex result;
 	result.x = a.x * b.x - a.y * b.y;
 	result.y = a.x * b.y + a.y * b.x;
 	return result;
 }
-__device__ cuComplex cMult(cuComplex a, float b)
+__device__ cuDoubleComplex cMult(cuDoubleComplex a, float b)
 {
-	cuComplex result;
+	cuDoubleComplex result;
 	result.x = a.x * b;
 	result.y = a.y * b;
 	return result;
 }
-__device__ cuComplex cAdd(cuComplex a, cuComplex b)
+__device__ cuDoubleComplex cAdd(cuDoubleComplex a, cuDoubleComplex b)
 {
-	cuComplex r;
+	cuDoubleComplex r;
 	r.x = a.x + b.x;
 	r.y = a.y + b.y;
 	return r;
 }
-__device__ cuComplex cAdd(cuComplex a, float b)
+__device__ cuDoubleComplex cAdd(cuDoubleComplex a, float b)
 {
-	cuComplex r;
+	cuDoubleComplex r;
 	r.x = a.x + b;
 	r.y = a.y;
 	return r;
 }
-__device__ cuComplex cExp(cuComplex a)
+__device__ cuDoubleComplex cExp(cuDoubleComplex a)
 {
-	cuComplex r;
+	cuDoubleComplex r;
 	r.x = exp(a.x) * cos(a.y);
 	r.y = exp(a.x) * sin(a.y);
@@ -51,9 +51,9 @@ __device__ cuComplex cExp(cuComplex a)
 	return r;
 }
-__device__ float cMag(cuComplex a)
+__device__ double cMag(cuDoubleComplex a)
 {
-	float r = sqrt(a.x * a.x + a.y * a.y);
+	double r = sqrt(a.x * a.x + a.y * a.y);
 	return r;
 }
@@ -8,14 +8,16 @@
 #include <complex>
 using namespace std;
+typedef float rtsFloat;
+
 struct SpecPair{
-	float nu;
-	float A;
+	double nu;
+	double A;
 };
 struct Material{
-	vector<float> nu;
-	vector<complex<float>> eta;
+	vector<double> nu;
+	vector<complex<double>> eta;
 	string name;
 };
@@ -47,16 +49,16 @@ void FitDisplay();
 //Update Functions
 void UpdateDisplay();
 void SimulateSpectrum();
-void cudaKramersKronig(float* cpuN, float* cpuK, int nVals, float nuStart, float nuEnd, float nOffset);
-void cudaComputeSpectrum(float* cpuI, float* cpuB, float* alpha,
-						 int Nl, int nLambda, float oThetaI, float oThetaO, float cThetaI, float cThetaO, int nSamples);
+void cudaKramersKronig(double* cpuN, double* cpuK, int nVals, double nuStart, double nuEnd, double nOffset);
+void cudaComputeSpectrum(double* cpuI, double* cpuB, double* alpha,
+						 int Nl, int nLambda, double oThetaI, double oThetaO, double cThetaI, double cThetaO, int nSamples);
 //Window Parameters
-extern float nuMin;
-extern float nuMax;
-extern float aMin;
-extern float aMax;
-extern float dNu;
+extern double nuMin;
+extern double nuMax;
+extern double aMin;
+extern double aMax;
+extern double dNu;
 extern bool dispRefSpec;
 extern bool dispSimSpec;
 extern bool dispSimK;
@@ -65,16 +67,16 @@ extern bool dispSimN;
 extern bool dispMatN;
 extern SpecType dispSimType;
 extern bool dispNormalize;
-extern float dispNormFactor;
+extern double dispNormFactor;
-extern float dispScaleK;
-extern float dispScaleN;
+extern double dispScaleK;
+extern double dispScaleN;
 //material parameters
-extern float radius;
-extern float baseIR;
-extern float cA;
+extern double radius;
+extern double baseIR;
+extern double cA;
 extern vector<SpecPair> EtaK;
 extern vector<SpecPair> EtaN;
 extern bool applyMaterial;
@@ -86,22 +88,22 @@ void ChangeAbsorbance();
 void SetMaterial();
 //optical parameters
-extern float cNAi;
-extern float cNAo;
-extern float oNAi;
-extern float oNAo;
+extern double cNAi;
+extern double cNAo;
+extern double oNAi;
+extern double oNAo;
 extern OpticsType opticsMode;
 extern bool pointDetector;
 extern int objectiveSamples;
 //fitting parameters
-extern float minMSE;
+extern double minMSE;
 extern int maxFitIter;
 void EstimateMaterial();
-extern float scaleI0;
-extern float refSlope;
+extern double scaleI0;
+extern double refSlope;
-float ComputeDistortion();
+double ComputeDistortion();
 void MinimizeDistortion();
@@ -48,7 +48,7 @@ public:
 		//material selection combo box
 		ui.cmbMaterial->clear();
-		for(int i=0; i<MaterialList.size(); i++)
+		for(unsigned int i=0; i<MaterialList.size(); i++)
 			ui.cmbMaterial->addItem(MaterialList[i].name.c_str(), i);
 		ui.cmbMaterial->setCurrentIndex(currentMaterial);
@@ -350,6 +350,9 @@
        <height>22</height>
       </rect>
      </property>
+     <property name="decimals">
+      <number>6</number>
+     </property>
      <property name="minimum">
       <double>-9999.000000000000000</double>
      </property>
@@ -362,7 +365,7 @@
     </widget>
     <widget class="QSpinBox" name="spinNuMin">
      <property name="enabled">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <property name="geometry">
       <rect>
@@ -372,6 +375,9 @@
        <height>22</height>
       </rect>
      </property>
+     <property name="minimum">
+      <number>1</number>
+     </property>
      <property name="maximum">
       <number>4000</number>
      </property>
@@ -404,6 +410,9 @@
        <height>22</height>
       </rect>
      </property>
+     <property name="decimals">
+      <number>6</number>
+     </property>
      <property name="minimum">
       <double>-9999.000000000000000</double>
      </property>
@@ -419,7 +428,7 @@
     </widget>
     <widget class="QSpinBox" name="spinNuMax">
      <property name="enabled">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <property name="geometry">
       <rect>
@@ -429,8 +438,11 @@
        <height>22</height>
       </rect>
      </property>
+     <property name="minimum">
+      <number>1</number>
+     </property>
      <property name="maximum">
-      <number>4000</number>
+      <number>100000</number>
      </property>
      <property name="singleStep">
       <number>10</number>
@@ -509,6 +521,9 @@
        <height>22</height>
       </rect>
      </property>
+     <property name="decimals">
+      <number>6</number>
+     </property>
      <property name="minimum">
       <double>-99.989999999999995</double>
      </property>
@@ -19,15 +19,15 @@ vector&lt;SpecPair&gt; EtaK;
 vector<SpecPair> EtaN;
 int currentSpec = 0;
-float nuMin = 800;
-float nuMax = 4000;
-float dNu = 2;
+double nuMin = 800;
+double nuMax = 4000;
+double dNu = 2;
-float aMin = 0;
-float aMax = 1;
+double aMin = 0;
+double aMax = 1;
-float scaleI0 = 1.0;
-float refSlope = 0.0;
+double scaleI0 = 1.0;
+double refSlope = 0.0;
 bool dispRefSpec = true;
 bool dispSimSpec = true;
@@ -35,17 +35,17 @@ bool dispSimK = true;
 bool dispMatK = true;
 bool dispSimN = true;
 bool dispMatN = true;
-float dispScaleK = 1.0;
-float dispScaleN = 1.0;
+double dispScaleK = 1.0;
+double dispScaleN = 1.0;
 SpecType dispSimType = AbsorbanceSpecType;
 bool dispNormalize = false;
-float dispNormFactor = 1.0;
+double dispNormFactor = 1.0;
 //material parameters
-float radius = 4.0f;
-float baseIR = 1.49f;
-float cA = 1.0;
+double radius = 4.0f;
+double baseIR = 1.49f;
+double cA = 1.0;
 //vector<SpecPair> KMaterial;
 //vector<SpecPair> NMaterial;
 bool applyMaterial = true;
@@ -53,16 +53,16 @@ vector&lt;Material&gt; MaterialList;
 int currentMaterial = 0;
 //optical parameters
-float cNAi = 0.0;
-float cNAo = 0.6;
-float oNAi = 0.0;
-float oNAo = 0.6;
+double cNAi = 0.0;
+double cNAo = 0.6;
+double oNAi = 0.0;
+double oNAo = 0.6;
 OpticsType opticsMode = TransmissionOpticsType;
 bool pointDetector = false;
 int objectiveSamples = 200;
 //fitting parameters
-float minMSE = 0.00001;
+double minMSE = 0.00001;
 int maxFitIter = 20;
 void TempSimSpectrum()
@@ -71,7 +71,7 @@ void TempSimSpectrum()
 	for(int i=800; i<4000; i++)
 	{
 		temp.nu = i;
-		temp.A = sin((float)i/200);
+		temp.A = sin((double)i/200);
 		SimSpectrum.push_back(temp);
 	}
 }
@@ -94,11 +94,11 @@ void LoadMaterial(string fileNameK, string fileNameN, string materialName)
 		exit(1);
 	}
-	complex<float> eta;
-	int j;
-	for(int i=0; i<KMaterial.size(); i++){
+	complex<double> eta;
+	//int j;
+	for(unsigned int i=0; i<KMaterial.size(); i++){
 		newMaterial.nu.push_back(KMaterial[i].nu);
-		eta = complex<float>(NMaterial[i].A, KMaterial[i].A);
+		eta = complex<double>(NMaterial[i].A, KMaterial[i].A);
 		newMaterial.eta.push_back(eta);
 	}
 	MaterialList.push_back(newMaterial);
@@ -114,15 +114,15 @@ void LoadMaterial(string fileNameK, string materialName){
 	//compute the real IR using Kramers Kronig
 	//copy the absorbance values into a linear array
-	float* k = (float*)malloc(sizeof(float) * KMaterial.size());
-	float* n = (float*)malloc(sizeof(float) * KMaterial.size());
-	for(int i=0; i<KMaterial.size(); i++)
+	double* k = (double*)malloc(sizeof(double) * KMaterial.size());
+	double* n = (double*)malloc(sizeof(double) * KMaterial.size());
+	for(unsigned int i=0; i<KMaterial.size(); i++)
 		k[i] = KMaterial[i].A;
 	//use Kramers Kronig to determine the real part of the index of refraction
 	cudaKramersKronig(n, k, KMaterial.size(), KMaterial[0].nu, KMaterial.back().nu, baseIR);
 	SpecPair temp;
-	for(int i=0; i<KMaterial.size(); i++)
+	for(unsigned int i=0; i<KMaterial.size(); i++)
 	{
 		temp.nu =  KMaterial[i].nu;
 		temp.A = n[i];
@@ -132,11 +132,10 @@ void LoadMaterial(string fileNameK, string materialName){
 	//create the material
 	Material newMaterial;
 	newMaterial.name = materialName;
-	complex<float> eta;
-	int j;
-	for(int i=0; i<KMaterial.size(); i++){
+	complex<double> eta;
+	for(unsigned int i=0; i<KMaterial.size(); i++){
 		newMaterial.nu.push_back(KMaterial[i].nu);
-		eta = complex<float>(NMaterial[i].A, KMaterial[i].A);
+		eta = complex<double>(NMaterial[i].A, KMaterial[i].A);
 		newMaterial.eta.push_back(eta);
 	}
@@ -144,12 +143,12 @@ void LoadMaterial(string fileNameK, string materialName){
 }
 void FitDisplay(){
-	float minA = 99999.0;
-	float maxA = -99999.0;
-	float k, n;
+	double minA = 99999.0;
+	double maxA = -99999.0;
+	double k, n;
 	if(dispSimSpec)
-		for(int i=0; i<SimSpectrum.size(); i++)
+		for(unsigned int i=0; i<SimSpectrum.size(); i++)
 		{
 			if(SimSpectrum[i].A < minA)
 				minA = SimSpectrum[i].A;
@@ -158,7 +157,7 @@ void FitDisplay(){
 		}
 	if(dispRefSpec && RefSpectrum.size() > 0)
-		for(int i=0; i<RefSpectrum[currentSpec].size(); i++)
+		for(unsigned int i=0; i<RefSpectrum[currentSpec].size(); i++)
 		{
 			if(RefSpectrum[currentSpec][i].A < minA)
 				minA = RefSpectrum[currentSpec][i].A;
@@ -166,7 +165,7 @@ void FitDisplay(){
 				maxA = RefSpectrum[currentSpec][i].A;
 		}
 	if(dispMatK)
-		for(int i=0; i<EtaK.size(); i++)
+		for(unsigned int i=0; i<EtaK.size(); i++)
 		{
 			k = MaterialList[currentMaterial].eta[i].imag() * dispScaleK;
 			if(k < minA)
@@ -175,7 +174,7 @@ void FitDisplay(){
 				maxA = k;
 		}
 	if(dispSimK)
-		for(int i=0; i<EtaK.size(); i++)
+		for(unsigned int i=0; i<EtaK.size(); i++)
 		{
 			k = EtaK[i].A * dispScaleK;
 			if(k < minA)
@@ -184,7 +183,7 @@ void FitDisplay(){
 				maxA = k;
 		}
 	if(dispMatN)
-		for(int i=0; i<EtaN.size(); i++)
+		for(unsigned int i=0; i<EtaN.size(); i++)
 		{
 			n = (MaterialList[currentMaterial].eta[i].real() - baseIR) * dispScaleN;
 			if(n < minA)
@@ -193,7 +192,7 @@ void FitDisplay(){
 				maxA = n;
 		}
 	if(dispSimN)
-		for(int i=0; i<EtaN.size(); i++)
+		for(unsigned int i=0; i<EtaN.size(); i++)
 		{
 			n = (EtaN[i].A - baseIR) * dispScaleN;
 			if(n < minA)
@@ -213,10 +212,10 @@ void ChangeAbsorbance(){
 	//copy the absorbance values into a linear array
 	int nSamples = MaterialList[currentMaterial].eta.size();
-	float startNu = MaterialList[currentMaterial].nu.front();
-	float endNu = MaterialList[currentMaterial].nu.back();
-	float* k = (float*)malloc(sizeof(float) * nSamples);
-	float* n = (float*)malloc(sizeof(float) * nSamples);
+	double startNu = MaterialList[currentMaterial].nu.front();
+	double endNu = MaterialList[currentMaterial].nu.back();
+	double* k = (double*)malloc(sizeof(double) * nSamples);
+	double* n = (double*)malloc(sizeof(double) * nSamples);
 	for(int i=0; i<nSamples; i++)
 		k[i] = MaterialList[currentMaterial].eta[i].imag() * cA;
@@ -230,7 +229,7 @@ void ChangeAbsorbance(){
 	SpecPair temp;
 	//load the imaginary IR from the absorbance data
-	float nu;
+	double nu;
 	for(int i=0; i<nSamples; i++){
 		nu = MaterialList[currentMaterial].nu[i];
 		if(nu >= nuMin && nu <= nuMax){
@@ -253,7 +252,7 @@ void SetMaterial()
 	EtaN.clear();
 	int nSamples = MaterialList[currentMaterial].eta.size();
-	float nu;
+	double nu;
 	SpecPair temp;
 	for(int i=0; i<nSamples; i++){
 		nu = MaterialList[currentMaterial].nu[i];
@@ -104,7 +104,7 @@
 	 {
 		 glColor3f(1.0, 1.0, 1.0);
 		 glBegin(GL_LINE_STRIP);
-		 for(int i=0; i<SimSpectrum.size(); i++)
+		 for(unsigned int i=0; i<SimSpectrum.size(); i++)
 			 glVertex2f(SimSpectrum[i].nu, SimSpectrum[i].A);
 		 glEnd();
 	 }
@@ -113,7 +113,7 @@
 		 glColor3f(0.5, 0.5, 0.5);
 		 glBegin(GL_LINE_STRIP);
 		 float nu;
-		 for(int i=0; i<RefSpectrum[currentSpec].size(); i++)
+		 for(unsigned int i=0; i<RefSpectrum[currentSpec].size(); i++)
 		 {
 			 nu = RefSpectrum[currentSpec][i].nu;
 			 glVertex2f(nu, RefSpectrum[currentSpec][i].A + nu * refSlope);
@@ -139,7 +139,7 @@
 	 {
 		 glColor3f(1.0, 1.0, 0.0);
 		 glBegin(GL_LINE_STRIP);
-		 for(int i=0; i<EtaK.size(); i++){
+		 for(unsigned int i=0; i<EtaK.size(); i++){
 			 glVertex2f(EtaK[i].nu, EtaK[i].A * dispScaleK);
 		 }
 		 glEnd();
@@ -160,7 +160,7 @@
 	 {
 		 glColor3f(0.0, 1.0, 1.0);
 		 glBegin(GL_LINE_STRIP);
-		 for(int i=0; i<EtaN.size(); i++)
+		 for(unsigned int i=0; i<EtaN.size(); i++)
 			 glVertex2f(EtaN[i].nu, (EtaN[i].A - baseIR) * dispScaleN);
 		 glEnd();
 	 }