Commits

Preshanth Jagannathan authored 775687e1126
Minor edits in the .h to ensure that type matches and build succeeds

code/synthesis/TransformMachines/ZernikeCalc.cc

Modified
192 192 }
193 193 }
194 194
195 195 return surf;
196 196 }
197 197
198 198
199 199 Int ZernikeCalc::calculateApertureZ(ApertureCalcParams *ap) {
200 200 cerr << "In calculateApertureZ" << endl;
201 201 int nx, ny, os, totpt;
202 + double freq;
202 203 os = ap->oversamp;
203 204 nx = ap->nx*os;
204 205 ny = ap->ny*os;
206 + freq = ap->freq;
205 207
206 208 totpt = nx*ny;
207 209
208 210 float deltax, deltay;
209 211 Vector<float> xcoords(totpt);
210 212 Vector<float> ycoords(totpt);
211 213
212 214 // 2 is the total interval across which the Zernike is defined,
213 215 // i.e., from (-1, 1).
214 216 deltax = 2./nx;
250 252
251 253 //m[0] = -2;
252 254 //m[1] = -1;
253 255 //m[2] = 1;
254 256
255 257 Vector<double> zernike_surf(totpt);
256 258 zernike_surf = ZernikeSurf(amp, m, n, xcoords, ycoords, nx, ny);
257 259
258 260 cout << "Done" << endl;
259 261
260 - exit(0);
262 + //exit(0);
261 263
262 264 IPosition shape(ap->aperture->shape());
263 265
264 - Array<Complex> tmpimg(shape);
266 + //Array<Complex> tmpimg(shape);
265 267
266 - ap->aperture->get(tmpimg);
268 + //ap->aperture->get(tmpimg);
267 269
268 270
269 271 return 0;
270 272 }
271 273 };

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut