-
- Downloads
Task #9939: merge trunk into this branch
Note that I'm unable to merge trunk changes merged into ResponsiveTelescope-9893 into this branch (svn limitation) before merging this branch into ResponsiveTelescope-9893 (which I only want to do once I'm done, and now preferably via the trunk). Solve merge conflicts on: - LCS/MessageDaemons/src/MessageRouter.conf.ccu001 Revert my change to symlink to .ccu199. Maintain my change to extend a rule in .ccu001 and .ccu199 (both files are now identical). - momqueryservice.py: File moved while it was changed. Maintain my change to add a 'return []' on connection failure. This is better than the default of returning None in this case. Also replace unused loop idx 'i' by '_' in 2 places. Note that the ResponsiveTelescope-9893 has more changes to this file. Part of the trunk has already been merged into there, so will need careful merge between the 2 sides later. - RA assignment.py: radbrpc.updateTask() renamed its arg from status to task_status, so adjust to that. Maintain all my changes. This also reduces the nr of occurances of status -> task_status to 1.
Showing
- .gitattributes 146 additions, 93 deletions.gitattributes
- .gitignore 0 additions, 6 deletions.gitignore
- CEP/Calibration/BBSControl/scripts/parmdbplot.py 2 additions, 2 deletionsCEP/Calibration/BBSControl/scripts/parmdbplot.py
- CEP/DP3/DPPP/src/MSUpdater.cc 30 additions, 13 deletionsCEP/DP3/DPPP/src/MSUpdater.cc
- CEP/DP3/DPPP/src/MSWriter.cc 29 additions, 19 deletionsCEP/DP3/DPPP/src/MSWriter.cc
- CEP/GSM/src/gsm.py 1 addition, 1 deletionCEP/GSM/src/gsm.py
- CEP/GSM/src/lsm.py 1 addition, 1 deletionCEP/GSM/src/lsm.py
- CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py 8 additions, 8 deletions...Pipeline/framework/lofarpipe/support/loggingdecorators.py
- CEP/Pipeline/helper_scripts/selfcal.parset 2 additions, 2 deletionsCEP/Pipeline/helper_scripts/selfcal.parset
- CEP/Pipeline/test/regression_tests/branch_imaging_regression.parset 2 additions, 2 deletions...ne/test/regression_tests/branch_imaging_regression.parset
- CEP/Pipeline/test/regression_tests/regression_test_runner.py 1 addition, 1 deletionCEP/Pipeline/test/regression_tests/regression_test_runner.py
- CEP/Pipeline/test/regression_tests/replace_parset_values.cfg 1 addition, 1 deletionCEP/Pipeline/test/regression_tests/replace_parset_values.cfg
- CEP/Pipeline/test/regression_tests/trunk_imaging_regression.parset 2 additions, 2 deletions...ine/test/regression_tests/trunk_imaging_regression.parset
- CEP/PyBDSM/doc/source/whats_new.rst 4 additions, 2 deletionsCEP/PyBDSM/doc/source/whats_new.rst
- CEP/PyBDSM/src/python/_version.py 2 additions, 0 deletionsCEP/PyBDSM/src/python/_version.py
- CEP/PyBDSM/src/python/gaul2srl.py 2 additions, 2 deletionsCEP/PyBDSM/src/python/gaul2srl.py
- CEP/PyBDSM/src/python/gausfit.py 3 additions, 3 deletionsCEP/PyBDSM/src/python/gausfit.py
- CEP/PyBDSM/src/python/output.py 9 additions, 1 deletionCEP/PyBDSM/src/python/output.py
- CEP/PyBDSM/src/python/rmsimage.py 1 addition, 1 deletionCEP/PyBDSM/src/python/rmsimage.py
- CMake/LofarPackageList.cmake 9 additions, 1 deletionCMake/LofarPackageList.cmake
Loading
Please register or sign in to comment