| package | who merging | status | Note1 | Note2 | Note3 |
| AnalysisService | Chris | Done 11 | Alan has merged changes in the following: DcsInterface?, ConfigurationInterface?, Pipeline Algorithm, some of AnalysisService, AnalysisWorkerGroup? - not sure all changes picked up | | |
| ArchivingService | Chris | No changes | | | |
| build | Chris | Done -1 | | | |
| CalibrationController | Chris | done 8 | Alan has merged changes related to the new RxThreshold (config register), and the forced update updateWith() | Chris has noticed that the request.setClockByTwo(false) line was removed from CC/src/scripts/RawScan.h between v1.4 and v1.5, i.e. during the OmniMigration. Was this an accident or deliberate? | OK .. think I (Chris) have now grabbed all the remaining changes necessary for this merge, including one extra set of changes to RawScan.h that were related to the new RxThreshold but that (so far as I can tell) may have been missed by Alan, or at least not commited at any rate. |
| config | Chris | No changes | | | |
| daq-1 | Chris | No changes | | | |
| decodeTestStand | Chris | No changes | | | |
| docs | Chris | No changes | | | |
| exampleSetup.csh | Chris | no change | | | |
| exampleSetup.sh | Chris | no change | | | |
| FittingService | Chris | Done 9 | | | |
| GuiComponents? | Chris | Done 12 | | | |
| logs | Chris | No changes | | | |
| Makefile | Chris | no change | | | |
| MiniUtils | Chris | No changes | | | |
| README | Chris | no change | | | |
| SCT | Chris | done 1 | | | For some strange reason, cvsbelieves SCT/src/IpcException?.{h,cpp} should be used, despite the fact that they were deleted some time ago .. will try to ensure they die this time. |
| SctApi | Chris | done 6 | | | |
| SctApiIPC? | Chris | done 7 | | | There's something very dodgy in this package w.r.t. how it handles dependancies of either (a) files it copies to the include area, and/or (b) idl files, (c) files it stubbs from idl files. Sometimes you have to make clean,them make, or even scrub the include area and start again. Someone must fix this ... |
| sctConf | Chris | done 2 auto | | | |
| sctConfIPC | Chris | done 3 auto | | | |
| SCTData | Chris | done 4 | Alan has added a new streamer for DcsData? (version2) which is beyond the scope of this merge (was added to Release 3 8/11/04) | | |
| SctDataDisplay? | Chris | done 14 | | | |
| sctddc-00-00-02 | Chris | done 5 auto | | | |
| sctGUI | Chris | done 13 | | | |
| SctService | Chris | No changes | | | |
| SCTTestAPI? | Chris | No changes | | | |
| setup.csh | Chris | no change | | | |
| setup.sh | Chris | no change | | | |
| start | Chris | no change | | | |
| SummaryWriter? | Chris | done 10 | | | |
| SystemTests | Chris | done 15 | | | |
| TestGUI? | Chris | No changes? | | | |
| webscripts | Chris | No changes | | | |