Made a bunch of progress on the fast scan database wizard. Hit a snag where the SGMPeriodicTable doesn't really realize there's more than one database. Need to address that, saving before I crack open that can of worms.
Significant progress towards finishing the fast scan modification wizard.
Added new diodes to the fast scan system. Non-optional, they are always collected when fast scans are run. Also had to update the SGM2010FastScan file loader to handle 10000 points (10 channels).
Added the new SGMLookupTable, with seeds of some generalization. Also added support to fast scanning for auxiliary channels, particularly in file loader.
Merge branch 'master' of github.com:acquaman/acquaman
Commented out line in SGM App Controller referencing old workflow view.
Renamed AMDetector, AMDetectorInfo, AMDetectorSet, and AMDetectorInfoSet to AM[Old] version to prepare for using new AMDetector suite. Also had to make a pair of upgrades to handle the changes to AMDetectorInfo and AMDetectorInfoSet. Deployed those changes. Made a brief modification to dbObjectClassBecomes to handle classes that are on the left hand side of the indexing table ... though this only works right now for the situation where no merge is necessary. Might need to figure out a better way to coordinate the upgrades between AMDatamanAppController, AMDatamanAppControllerForActions3, and SGMAppController.
Moved forward on the new AMDetector interface. Added AMDetectorInfo and a namespace for common enums. Fired a tracer round through a new version of the Amptek detectors. Looks promising. Needs beamline testing.
Changed AMDetectorView and its support class/namespace to have make them AMOldDetector name compliant. Changed to prepare for other AMDetector upgrades.
Also renamed the DetectorView and support class files.
Made some minor adjusts and comments to AMDetector. Also had to fix some includes in other files.
Added new general AMDetectorView class, tracer round work in progress. Rewrote a bunch of AMDetector to make it more state machine like and easier to subclass. Subclasses should need to fill in far fewer pure virtual functions with just return true or return false.
Added basic implementation for AMDetectorSet and AMDetectorInfoSet. These have not been field tested at all. Added general AM support for synchronized dwell that the CLSSynchronizedDwellTime is now inheriting. Also added some support for its use in AMBeamline and AMDetector.
Added some inter-object support for detectors to AMScanConfiguration and AMBeamline. Had to add AMDetectorInfo and AMDetectorInfoSet to the file loader plugins common include project information.
Filling in some new AMBeamline functionality in SGMBeamline.
Added functionality to check for detector availability in AMBeamline (self checks against the exposedDetectors using the passed detector info. Added a class for detector groups to the AMDetectorSet files. Once tested, if successful, will be moved to its own file.
Moved the previous version of AMDetectorSetView to AMOldDetectorSetView. Made a new AMDetectorSelectView as well as AMDetectorSelector and AMDetectorGroup classes. Fixed up some issues with the new AMDetectorSet (that also would have existed in the old AMDetectorSet) where the connected signal was not being emitted properly on detector removals. Should check on AMControlSet to see. Code still has some debugging to be removed soon.
Fixed the same removeControl issue in AMControlSet. Removed some debugging from AMDetectorSet.
Added a second view (brief view) to the general AMDetectorView file. Added that in the AMDetectorSelectorView.
Added a new detector type for basic access to scaler channels as detectors. Tracer round, seems to be generally working. Removed some debugging and commented out sections as well.