First
- Freeze SctRodDaq_3_0_BRANCH
- Haz been frozen since 14th Hanuary 2005 when Release 3.2.RC1 was made.
- Tag SctRodDaq_3_0_BRANCH in frozen state as MERGE_POINT_B3
- Done
- Freeze HEAD
- Chris sent mail 13th August asking all developers to cease commitals till this part of the merge is complete.
- Tag HEAD in its pre-merge frozen state as MERGE_POINT_C8
- Well ... decided not to freeze HEAD, but have tagged a thought-to-be-good state (a little post SctRodDaq_4_1_1) as MERGE_POINT_C8 and am looking at the changes that would be merged into it as a result of updates between MERGE_POINT_B2 and MERGE_POINT_B3
Then
- Merge all (not already merged) changes between MERGE_POINT_B2 and MERGE_POINT_B3 into HEAD, one package at a time. Keep a record of progress below:
| package | who merging | status | Note1 | Note2 | Note3 (what the changes are that seem to be there) | |
| AnalysisService | Chris | done | None | |||
| ArchivingService | Chris | done | None | |||
| build | Chris | done | None | |||
| CalibrationController | Chris | done | Implementation of SequenceLibrary? methods capable of returning quickCharacterisationSequences (in addition to ordinary ones) | |||
| config | Chris | *** | Probably best not to merge changes from here, or only with caution. People have their config files working in HEAD these days, and we do not want to break them | *** | Addition of startup dependancy: SCTAPIServerISServer? to depend on config server and "IS Server Fitted Data" (does that exist??) In fact, the change recommended here is actually wrong, so it will not be added to HEAD. | |
| daq-1 | Chris | done | None | |||
| decodeTestStand | Chris | done | Trivial changes to ".cvsignore" | |||
| docs | Chris | done | None | |||
| FittingService | Chris | done | None | |||
| GuiComponents? | Chris | *** | No changes from this package are to be merged! There were bugs introduced at the end of B3 macro assembly that we do not want to incorporate into HEAD | *** | None | |
| logs | Chris | done | None | |||
| MiniUtils | Chris | done | None | |||
| SCT | Chris | done | None | |||
| SctApi | Chris | done | SctApi/macros/synchNoise.cxx : noise.trigsPerBurst increased from 5,000 to 50,000. (This macro will change again soon anyway [Alan]) some config, some other configuration changes in same file. SctApi/crate.cxx : change I don't understand where someone wants to use "mrs" instead of "tempMrs" to report a message during aquisition of VmeInterface? pointer. Plus change to same file which limits spurious output of boring error messages. Dont want to undo bruce's improvements to the zeroTo123Pos code in SctApi/SctApi.cxx. In same file Bruce removed about 15 lines of code beginning "if(redundantValid == true && redundantOnRod == false) {". Don't know why. Some printout was removed., and some other printout added. Bruce made a change to the way he initialised a buildPrim.cmdBuff. I think the changes to SctApi/SctApiHisto?.cxx are just cosmetic. In SctApi/SctApiMConf?.cxx don't want to undo bruce's improvements to the zeroTo123Pos code. | |||
| SctApiIPC? | Chris | done | Useful comment added to SctApiIPC?/SctApiServerMain?.cc | |||
| sctConf | Chris | done | sctConf/checkSctConfig.cc seems to have more features. sctConf/configuration.cc has better error checking of config files. sctConf/powerDump.cc has an alteration to its output terminology (STBY->STB) but more interestingly it loops over the first 8 rather than the first 2 crates, after the update. Do we want this or not? Probably we do. | |||
| sctConfIPC | Chris | done | sctConfIPC/configipc.cc actually IMPLEMENTS the setModuleErrorMask methods (there are about three of them) rather than just pretending to implement them. I suspect that we DO want these changes. sctConfIPC/configserver.{h,cc} are also involved in implementing those methods, and sctConfIPC/configuration.idl needs to declare them. | |||
| SCTData | Chris | done | Small bugfix to UnitTest? Makefile which is presumably desired. | |||
| SctDataDisplay? | Chris | done | SctDataDisplay?/Displayer.cpp seems to have more (or at least slightly different) functionaility. DisplayInfo?.h had its vertial destructor removed. Why? Is this important? (Dont know why this happened - may have been 'accidental' [Alan]) Some unused arguments seem to have been removed from SctDataDisplay?/FitDisplayer?.cpp, and there seems to have been some un-understandable jiggery pokery with SctDataDisplay?/RawDisplayer?.cpp. Perhaps someone would like to have whatever feature this provides added? Upon close inspection, it appears that all of these files have been so heavily edited since December that all the December changes now seem irrelevant. I think there are no important fixes here. I have not committed any. | |||
| sctddc-00-00-02 | Chris | done | None | |||
| sctGUI | Chris | *** | No changes from this package are to be merged! There were bugs introduced at the end of B3 macro assembly that we do not want to incorporate into HEAD | *** | *** | |
| SctService | Chris | done | None | |||
| SCTTestAPI? | Chris | done | None | |||
| SummaryWriter? | Chris | done | None | |||
| SystemTests | Chris | done | None | |||
| TestGUI? | Chris | done | None | |||
| webscripts | Chris | Better check with Dave, but it looks to me like webscripts/sctroddaqsummary.cgi was substantially modified and then committed to the Rel3 branch, but this big change has never made it to head. On the other hand I don't understand cgi scripts. On balance of probability we should bring over the change, but Dave should be consulted. | ||||
| -- | -- | -- | -- | -- | -- | -- |
| exampleSetup.csh | Chris | done | None | |||
| exampleSetup.sh | Chris | done | None | |||
| Makefile | Chris | done | None | |||
| README | Chris | done | None | |||
| setup.csh | Chris | done | None | |||
| setup.sh | Chris | done | None | |||
| start | Chris | done | Addition of dubious "killall -9 ddc*" type type commands (was accidentally added at oxford - hang-over from Release3 nastyness [Alan]) |
Note that at Cambridge, JCH in collaboration with BG had changes line 1031 of CVS revision 1.122 of SctApi/SctApiHisto?.cxx from
api.getABCDModule(mid, SCTAPI_BANK_SCAN);
to
api.getABCDModule(mid, SCTAPI_BANK_CALIBRATION);
in order to make it better at coping with assembler histogramming. This change made things better, but not all things better, and was never committed to the repository, though there are arguments for doing so.
Then
- Tag HEAD once merge from SctRodDaq_3_0_BRANCH is complete as MERGE_POINT_C9
- Done
- Note that we are still waiting to hear from Dave wrt webscripts dir. This is the only package that has not (necessarily) been done, though it has been tagged as the others. If he wants me to update the file I will do so and move the MERGE_POINT_C9 tag. [Chris]