A

acquaman

Settings | Report Duplicate

0

I Use This!

Inactive

Commits : Listings

Analyzed about 13 hours ago. based on code collected about 23 hours ago.

Commit Message	Contributor	Files Modified	Lines Added	Lines Removed	Code Location	Date
May 04, 2023 — May 04, 2024 Showing page 1 of 385 Search / Filter on:
Merge pull request #2473 from acquaman/Issue2466	Darren Hunter	More...				almost 8 years ago
Merge pull request #2508 from acquaman/Issue2507	Darren Hunter	More...				almost 8 years ago
Modified:	Michael Butler	More...				almost 8 years ago
Merge pull request #2428 from acquaman/Issue2346	Darren Hunter	More...				almost 8 years ago
Merge pull request #2498 from acquaman/Issue2497	Darren Hunter	More...				almost 8 years ago
Merge pull request #2499 from acquaman/Issue2477	Darren Hunter	More...				almost 8 years ago
Merge pull request #2494 from acquaman/Issue2493	Darren Hunter	More...				almost 8 years ago
Modified:	Michael Butler	More...				almost 8 years ago
Pulled in changes from master, fixed minor merge conflicts.	helfrij	More...				almost 8 years ago
Removed the test CLSControlEditor from the PGM persistent view. #2466	helfrij	More...				almost 8 years ago
Merge branch 'master' into Issue2466	helfrij	More...				almost 8 years ago
Removed commented out code. #2497	helfrij	More...				almost 8 years ago
Modified the top window on the downstream actuator of the Main carbon filter farm to have a 700um filter (instead of none). Commented out the code that set a window preference for the 'none' option, not sure whether or not to keep it yet (there is only one way to achieve no filter now and that's to remove the actuator entirely). We'll see. #2497	helfrij	More...				almost 8 years ago
Merge pull request #2475 from acquaman/Issue2451	Darren Hunter	More...				almost 8 years ago
Merge pull request #2496 from acquaman/Issue2495	Darren Hunter	More...				almost 8 years ago
Moved code from AMBeamline::createScanInitializationAction(...) that dealt with initializing the scan axis controls to a new method, AMBeamline::createInitializeScanAxisControlsAction(...). Added calls to this method to AMBeamline, BioXASBeamline, IDEASBeamline. #2493	helfrij	More...				almost 8 years ago
Updated the carbon filter farm window setpoints for Side, Main, and Imaging. #2495	helfrij	More...				almost 8 years ago
Broke down the BioXASBeamline::createScanInitializationAction(...) into two sequential parts: the component initialization and the axis control initialization. The two shouldn't be done in parallel because part of the component initialization is to change the power setting for the bragg motor--the motor that would be moved as an axis control in XAS scans. I think this is safer. #2493	helfrij	More...				almost 8 years ago
Modified the argument to AMBeamline::createScanInitializationActions() from AMGenericStepScanConfiguration to AMScanConfiguration. More general. Beamlines can reimplement and cast the scan configuration argument to any particular scan configuration to generate initialization actions. #2493	helfrij	More...				almost 8 years ago
Reverted some of the changes made in f7e456a. Now that BioXASXASScanConfiguration inherits from BioXASGenericStepScanConfiguration, some of the changes are not needed. #2493	helfrij	More...				almost 8 years ago
Merge branch 'master' into Issue2493	helfrij	More...				almost 8 years ago
Modified the BioXAS XAS scan configuration. Removed the Q_PROPERTY macros from the header file, these are now duplicates of macros defined in BioXASGenericStepScanConfiguration. This error was causing the application to hang on startup frequently.	helfrij	More...				almost 8 years ago
Modified the BioXASBeamline::createInitializationActions() to include a call to AMBeamline::createInitializationActions() at the end of the actions list, so that the scan axis controls are sent to their first positions as part of scan initialization. Noticed that the list may contain some bugs, so made some more changes. The bugs for the most part are related to an assumption that all scan configurations are a subclass of BioXASGenericStepScanConfiguration, which isn't true (causing some steps to be missing). Requires testing to make sure everything is initialized properly for different kinds of scans. #2493	helfrij	More...				almost 8 years ago
Moved the default generic scan initialization actions from AMGenericStepScanController to AMBeamline. The default actions move the scan axis controls to their initial positions. This change is so that we can control when this initialization happens. For BioXAS, it would be better to initialize scan axis controls after any beamline-specific initialization (particularly for scans involving the mono, where the power must be turned on before scanning). #2493	helfrij	More...				almost 8 years ago
Restored the initialization actions in AMGenericStepScanController to be a parallel list, and instead removed an old/extra mono initialization that BioXASXASScanController added. Not needed, and sends mono to the incorrect energy anyways. Oh dear. #2493	helfrij	More...				almost 8 years ago
Changed the initialization actions list provided by AMGenericStepScanController from parallel to sequential. XAS scans seem to fail on initialization otherwise. #2493	helfrij	More...				almost 8 years ago
Merge pull request #2481 from acquaman/Issue2456	Darren Hunter	More...				almost 8 years ago
Modified:	Michael Butler	More...				almost 8 years ago
Merge pull request #2471 from acquaman/Issue2469	Darren Hunter	More...				almost 8 years ago
Merge pull request #2482 from acquaman/Issue2458	Darren Hunter	More...				almost 8 years ago

←
1
2
3
4
5
6
7
8
9
…
384
385
→