Use Shamock library on 64-bit Windows now that I found the correct library file

This commit is contained in:
Mark Rivers
2014-04-16 12:50:44 -05:00
parent 1556fb5865
commit ca9bef5e1e

View File

@@ -1487,8 +1487,8 @@ unsigned int AndorCCD::SaveAsSPE(char *fullFileName)
calibrationString = (char *) calloc(nx*20, sizeof(char));
for (i=0; i<nx; i++) calibration[i] = (float) i;
// If we are on Windows 32-bit and there is a valid Shamrock spectrometer get the calibration
#if defined(_WIN32) && !defined(_WIN64)
// If we are on Windows and there is a valid Shamrock spectrometer get the calibration
#ifdef _WIN32
int error;
int numSpectrometers;
error = ShamrockGetNumberDevices(&numSpectrometers);