 Mark Rivers
|
f4b38716f2
|
Merge branch 'master' of github.com:areaDetector/ADAndor
|
2016-07-12 16:55:41 -05:00 |
|
|
Mark Rivers
|
5ac3d236b0
|
Fixed bug in setupAcquisition when setting minX and minY based on binning; there was an incorrect factor of 2 present
|
2016-07-12 16:53:12 -05:00 |
|
|
Matthew Pearson
|
5ca26492e6
|
Add the ability to set the BaselineClamp setting in the Andor SDK.
|
2016-06-23 12:00:48 -04:00 |
|
|
Mark Rivers
|
a32342a2e3
|
Enforce minimum values of ADShutterCloseDelay and ADShutterOpenDelay based on query to SDK
|
2016-01-12 14:28:58 -06:00 |
|
|
timmmooney
|
48e35cc8b2
|
new display-file translations
|
2015-06-25 14:09:16 -05:00 |
|
|
timmmooney
|
7e263afd13
|
new display-file translations
|
2015-04-03 14:56:21 -05:00 |
|
|
Mark Rivers
|
823a73fc73
|
include ADBase_settings.req and NDFile_settings.req
|
2015-03-29 17:34:56 -05:00 |
|
|
Mark Rivers
|
e7bab3ad69
|
Added includes for ADBase.template and NDFile.template
|
2015-03-19 12:58:18 -05:00 |
|
|
Matthew Moore
|
83c32e2100
|
Fixed Tabs to spaces
|
2015-03-18 08:50:15 -05:00 |
|
|
Matthew Moore
|
c8956e7dea
|
adding flipper to adl
|
2015-03-17 14:38:57 -05:00 |
|
|
Matthew Moore
|
1c5e6fe119
|
Added support for flipper mirrors
|
2015-03-17 14:29:07 -05:00 |
|
|
Mark Rivers
|
33a9799b3d
|
Fixed problem building dynamically on win32-x86
|
2014-11-18 14:19:49 -06:00 |
|
|
Mark Rivers
|
177b89f498
|
Fixed problem with dynamic builds on Windows; fixed to enable Shamrock on Linux
|
2014-11-18 14:09:19 -06:00 |
|
|
Mark Rivers
|
b0c6d0c2f0
|
Add required include files for Linux; fix compiler warnings
|
2014-11-18 12:43:09 -06:00 |
|
|
Mark Rivers
|
a302de5424
|
Library renamed to lowercase on win32-x86; build shamrock on Linux, now have required library
|
2014-11-18 12:42:37 -06:00 |
|
|
Mark Rivers
|
b51710ea6c
|
Improved documentation for Doxygen
|
2014-09-14 17:11:10 -05:00 |
|
|
Mark Rivers
|
12ad9ac033
|
Fix for building dynamically on Windows
|
2014-05-28 11:34:45 -05:00 |
|
|
Mark Rivers
|
ca9bef5e1e
|
Use Shamock library on 64-bit Windows now that I found the correct library file
|
2014-04-16 12:50:44 -05:00 |
|
|
Mark Rivers
|
1556fb5865
|
Build Shamrock library on 64-bit Windows now that I found the correct library file
|
2014-04-16 12:49:45 -05:00 |
|
|
Mark Rivers
|
7e8af98608
|
Minor changes to avoid compiler warnings and fixes to comments
|
2014-04-15 15:30:36 -05:00 |
|
|
Mark Rivers
|
f532f30b0c
|
Fixed comments
|
2014-04-15 15:29:51 -05:00 |
|
|
Mark Rivers
|
56e16c5bf3
|
Fixes to allow building on windows-x64
|
2014-04-15 15:29:24 -05:00 |
|
|
Mark Rivers
|
2843b78362
|
Fixed problems in shutdown; statusTask could crash because it was not exiting during shutdown
|
2014-04-15 12:17:38 -05:00 |
|
|
Mark Rivers
|
21d89ad446
|
Add mExiting flag for shutdown
|
2014-04-15 12:16:38 -05:00 |
|
|
Mark Rivers
|
d0f155c53e
|
Removed epicsAtExit code and call to ShamrockClose; this kills camera and interferes with shutdown code in andorCCD.cpp
|
2014-04-15 12:15:57 -05:00 |
|
|
Mark Rivers
|
844ba86674
|
Add shamrockDummy.cpp on Linux
|
2014-04-13 11:57:35 -05:00 |
|
|
Mark Rivers
|
99f32031df
|
New dummy file for Linux
|
2014-04-13 11:57:05 -05:00 |
|
|
Mark Rivers
|
b90d9e5c60
|
Finished support for saving Version 3.0 SPE files with XML
|
2014-04-13 11:37:06 -05:00 |
|
|
Mark Rivers
|
2ced0e1856
|
Add TiXmlDocument to private data for SPE files
|
2014-04-13 11:36:07 -05:00 |
|
|
Mark Rivers
|
3363ffe04e
|
Add XML_Offset for Version 3.0 files
|
2014-04-13 11:35:28 -05:00 |
|
|
Mark Rivers
|
7042b8761b
|
Add shamrockSupport.dbd
|
2014-04-13 11:35:01 -05:00 |
|
|
Mark Rivers
|
4023a28326
|
Add SPE file format
|
2014-04-13 11:34:31 -05:00 |
|
|
Mark Rivers
|
228595d6ec
|
Changes for SPE and Shamrock support
|
2014-04-12 11:29:25 -05:00 |
|
|
Mark Rivers
|
21c3a7a4b1
|
Changes for SPE and Shamrock support
|
2014-04-12 11:29:08 -05:00 |
|
|
Mark Rivers
|
5f95cdd39a
|
Use EPICS data types
|
2014-04-12 11:28:36 -05:00 |
|
|
Mark Rivers
|
ff053bb584
|
Removed CalibCoeff records, not used
|
2014-04-12 09:46:10 -05:00 |
|
|
Mark Rivers
|
4051574eed
|
New file for Shamrock spectrometer
|
2014-04-12 09:23:20 -05:00 |
|
|
Mark Rivers
|
f8634a7f0f
|
New file for Shamrock spectrometer
|
2014-04-12 09:22:18 -05:00 |
|
|
Mark Rivers
|
68af36d6f4
|
Add shamrock.template
|
2014-04-12 09:21:51 -05:00 |
|
|
Mark Rivers
|
36a2f79c8a
|
New driver for Shamrock spectrometers; only supported on Windows
|
2014-04-12 07:52:42 -05:00 |
|
|
Mark Rivers
|
7d0d38116b
|
New file; original called cheader.h from Princeton Instruments EasyDLLS package
|
2014-04-12 07:52:02 -05:00 |
|
|
Mark Rivers
|
cb751b8444
|
Begin to implement SaveAsSPE
|
2014-04-12 07:45:25 -05:00 |
|
|
Mark Rivers
|
f37c282aa4
|
SaveAsSPE takes file name argument
|
2014-04-12 07:44:39 -05:00 |
|
|
Mark Rivers
|
cfc948fcbb
|
Add shamrockID to constructor; add saveAsSPE method
|
2014-04-12 07:15:20 -05:00 |
|
|
Mark Rivers
|
374e683885
|
Build Shamrock driver on Windows
|
2014-04-12 07:14:41 -05:00 |
|
|
Mark Rivers
|
ceb15503d4
|
Fixed width of widgets, overlooked in R2-0 release
|
2014-04-08 18:46:07 -05:00 |
|
|
Mark Rivers
|
2d0862ee3f
|
Now in autoconvert
|
2014-03-24 12:03:40 -05:00 |
|
|
Mark Rivers
|
f918f384cc
|
Now in autoconvert
|
2014-03-24 12:03:28 -05:00 |
|
|
timmmooney
|
d3718567fc
|
new display-file translations
|
2014-03-03 12:01:26 -06:00 |
|
|
Mark Rivers
|
b6662ef971
|
New file
|
2014-02-18 18:57:20 -06:00 |
|