{"push_id":685500892,"size":59,"distinct_size":59,"ref":"refs/heads/master","head":"876c021bd7e723cec9e0c86e8e4551315c108b3d","before":"a7ae452e3e1c0a89b33627f764b3e2a81e60f615","commits":[{"sha":"30f15f22ba28b360821d7d450bd81a395b7847d6","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Created new class BioXASBeamlineComponent that just provides a connect state and a means to update it. I think I'd like to have every possible beamline component to inherit from it on BioXAS, makes some things easier. Created new class BioXASM1Mirror that pretty closely resembles BioXASM2Mirror. It inherits from BioXASBeamlineComponent.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/30f15f22ba28b360821d7d450bd81a395b7847d6"},{"sha":"fd1d2b23fa07d0c21fc2d86a8f76abfdb2b45ca2","author":{"email":"83350271fc31a0e91ce54c0440921fe083f2ea6f@gmail.com","name":"Sheldon Liu"},"message":"Merge branch 'master' of github.com:acquaman/acquaman into Issue1397","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/fd1d2b23fa07d0c21fc2d86a8f76abfdb2b45ca2"},{"sha":"6c6037f57357c80eb4287ee56e042ba7685d6796","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Pulled changes in from master, fixed minor merge conflicts.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/6c6037f57357c80eb4287ee56e042ba7685d6796"},{"sha":"175bc2e2e537f0d5c745e55628c13f818e9267fd","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Created new class BioXASSideM1Mirror that subclasses BioXASM1Mirror. It creates instances of all mirror motors.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/175bc2e2e537f0d5c745e55628c13f818e9267fd"},{"sha":"6a46648b10cc30dcc50ceb1bd2ff8a72589b6fc7","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Renamed the pvs in BioXASSideM1Mirror to coincide with actual side m1 mirror names. Moved the Side m1 mirror class files to the appropriate directory. Changed the BioXASM2Mirror class to inherit from new BioXASBeamlineComponent class.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/6a46648b10cc30dcc50ceb1bd2ff8a72589b6fc7"},{"sha":"3f49a25410dbe976295e497012551d4a62ffbd7a","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Created new pitch control class, and started work on implementation. It's ongoing, the class is not complete.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/3f49a25410dbe976295e497012551d4a62ffbd7a"},{"sha":"f9eaa93d3679ea96eea8b8724cf1f3b78e3a0790","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Created a new subclass of CLSMAXvMotor, BioXASMirrorMotor. This adds on the ability to set and retrieve an x and y position, which are properties of the motors on the M1 and M2 mirrors (don't change). Streamlined some of the existing mirror classes with a better-defined class heirarchy, since the mirror classes are so similar. Created new class BioXASMirror, inherits from BioXASBeamlineComponent and provides pointers to the 7 basic motor controls common to both M1 and M2 mirrors on Side and Main. The existing BioXASM1Mirror and BioXASM2Mirror now both inherit from BioXASMirror and add pointers to their specific additional motors--the slit blade for M1 and the screen for M2. Propagated changes to the Side and Main specific subclasses. Created general view suitable for editing the properties of mirrors generally (the 7 basic motor controls), and specific views for M1 and M2 mirrors.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/f9eaa93d3679ea96eea8b8724cf1f3b78e3a0790"},{"sha":"dbe24dd6f18846cf6ac7672f363890a8ec477d08","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Added instances of the m1 mirror to BioXASSideBeamline, and m1 mirror view to the app controller.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/dbe24dd6f18846cf6ac7672f363890a8ec477d08"},{"sha":"3005fa56e4b6d415e4a4755cc005c4007c7be66c","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Renamed BioXASSideM1PitchControl to more general BioXASMirrorPitchControl.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/3005fa56e4b6d415e4a4755cc005c4007c7be66c"},{"sha":"f1a9b9362695ed552ffc04b03351d4739adad9a6","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Added instances of the new pitch control to the m1 and m2 mirrors on Side. Project builds, runs, and the pitch values displayed agree with the pseudomotor application values. Am not sure whether I can move these motors to test the reverse calculation--will wait and see.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/f1a9b9362695ed552ffc04b03351d4739adad9a6"},{"sha":"985b97f0f111127a52b18050c54358cd7ca4c0cb","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Added instance of the pitch control to the M2 mirror on Main.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/985b97f0f111127a52b18050c54358cd7ca4c0cb"},{"sha":"29af43620b2dbeb9386b851d966e9de82f2b873c","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"It looks like the roll and height controls will depend on the same three motors as the pitch control. I've created a new class BioXASMirrorPseudoMotorControl that inherits from AMPseudoMotorControl, and moved into it the aspects of the pitch control that I expect to be common among the three. The pitch control now inherits from it, as does the new roll control.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/29af43620b2dbeb9386b851d966e9de82f2b873c"},{"sha":"93d8373ebd43580aada50ac97ea6bcb3e4e10d08","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Filled in the roll control functionality from @beaured0's equations. Untested.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/93d8373ebd43580aada50ac97ea6bcb3e4e10d08"},{"sha":"1091f0917226119e41c75c36e43003f2c5a1b653","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Added the roll control to the basic BioXASMirror interface. Added a control editor for it in the BioXASMirrorView.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/1091f0917226119e41c75c36e43003f2c5a1b653"},{"sha":"56088f9cd42917f377e92febedd45364d91af384","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Added instance of the roll control to both M1 and M2 mirrors on Side.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/56088f9cd42917f377e92febedd45364d91af384"},{"sha":"60b69f74cad4ae03a293225269fa509ad29fcff2","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Created new class for the mirror height control, and basically copied into it the class contents of pitch. The height controls themselves have not been implemented yet, need to revisit all calculate methods.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/60b69f74cad4ae03a293225269fa509ad29fcff2"},{"sha":"322867d2a98cd9b78c2e4069e7c3cbad2994ac8b","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Pulled in changes from master, fixed minor merge conflicts.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/322867d2a98cd9b78c2e4069e7c3cbad2994ac8b"},{"sha":"5aa56a5598a6b6910b6a9a192e62c8760c3f85a8","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Changed the Side mono, carbon filter farm, and mirrors to inherit from the BioXASBeamlineComponent class. Implemented the calculateHeight method for the mirror height control.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/5aa56a5598a6b6910b6a9a192e62c8760c3f85a8"},{"sha":"2b2381932b750debbbf0578829aaa93df3dbc57f","author":{"email":"83350271fc31a0e91ce54c0440921fe083f2ea6f@gmail.com","name":"Sheldon Liu"},"message":"Merge branch 'master' of github.com:acquaman/acquaman into Issue1397","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/2b2381932b750debbbf0578829aaa93df3dbc57f"},{"sha":"6ed2180a7556abdec552487af79841cce6746b0d","author":{"email":"b112983fe7236771be67c24b76ba2dad66e40583@gmail.com","name":"helfrij"},"message":"Implemented the calculations for the mirror height control. The calculateHeight() result appears to agree with what the pseudomotor application generates, other calculations are untested.","distinct":true,"url":"https://api.github.com/repos/acquaman/acquaman/commits/6ed2180a7556abdec552487af79841cce6746b0d"}]}