| Branch |
Author(s) |
Last Commit |
Reviewer(s) |
Validation Method |
Date Merged into Develop |
Redmine Issue |
Notes |
| feature/21937_SMM_StaleSegmentWarnAndContinue |
KAB |
2/20/2019 |
|
|
|
#21937 |
|
| feature/22188_CodeCoverage |
ELF |
3/22/2019 |
|
|
|
#22188 |
Only changes to CMake/tests |
| feature/22543_Working_Dev2FDA_Merges |
KAB |
5/8/2019 |
|
|
|
#22543 |
Working branch |
| feature/22532_TimeUtils_ElapsedTimeFromTimespec |
ELF |
5/28/2019 |
|
|
|
#22532 |
|
| feature/22533_CFG_getNextWithDestinations |
KAB |
6/5/2019+ |
|
|
|
#22533 |
This is still a work in progress |
| feature/22925_RemoveCoutCerr |
ELF |
11/05/2019 |
|
|
|
#22925 |
|
| feature/23505_ContainerFragment_AppendFragment |
ELF |
11/02/2019 |
|
|
|
#23505 |
|
| feature/FreezeTraceBufferOnDetachWithException |
ELF |
8/24/2018 |
|
|
|
#21073 |
|
| feature/RawEvent_HeaderInArtDictionary |
ELF |
9/13/2018 |
|
|
|
#20815 |
|
| for_dune-artdaq |
KAB |
1/23/2019 |
|
|
|
#21814 |
Active working branch for protodune |
| working/22535_protoDFO_testing |
KAB |
6/12/2019 |
|
|
|
#22535 |
Work in progress |
| Branch |
Author(s) |
Last Commit |
Reviewer(s) |
Validation Method |
Date merged into develop |
Redmine Issue |
Notes |
| bugfix/22979_BuildInfo_AddTLOGs |
ELF |
11/04/2019 |
|
|
|
#22979 |
Aid for debugging |
| bugfix/23719_RootDAQOut_Fix |
ELF |
12/06/2019 |
RDR |
demo w/ s85 - saw error in msgviewer and RootOutput<guid>.root file; used bugfix branch and problem went away - demo ran w/o error and root output file was correct. |
12/06/2019 |
#23719 |
|
| feature/21828_TransferTest_MoreInformationAboutFailures |
ELF |
2/4/2019 |
|
|
|
#21828 |
|
| feature/21889_xmlrpc_commander_CleanupMethodPointers |
ELF |
2/12/2019 |
|
|
|
#21889 |
|
| feature/21925_BoardReaderCore_GetGeneratorPointer |
ELF |
2/19/2019 |
|
|
|
#21925 |
|
| feature/22068_CFG_UpdateDataBufferDepthFragmentsWithSize |
ELF |
10/24/2019 |
|
|
|
#22068 |
|
| feature/22220_SharedMemoryReader_EventNumberInTRACEs |
ELF |
3/26/2019 |
|
|
|
#22220 |
11/22/2019, ELF: Merge conflicts with develop |
| feature/22280_RoutingMasterCore_t |
ELF |
4/8/2019 |
|
|
|
#22280 |
|
| feature/22379_CFG_InvalidTimestampInRequest |
ELF |
4/19/2019 |
|
|
|
#22379 |
|
| feature/22456_SMR_CustomProductInstanceNames_v1.6 |
ELF |
6/12/2019 |
|
|
|
#22456 |
Merged develop into v1.5 branch. Made a few changes while implementing a demo Input source using this functionality |
| feature/22531_DataSenderManager_RankParameterToSendFragment |
ELF |
5/30/2019 |
|
|
|
#22531 |
|
| feature/22532_RequestAcknowledgements |
ELF |
5/15/2019 |
|
|
|
#22532 |
11/22/2019, ELF: Merge conflicts with develop |
| feature/22533_CFG_getNextWithDestinations |
KAB |
6/5/2019+ |
|
|
|
#22533 |
This is still a work in progress |
| feature/22543_Working_Dev2FDA_Merges |
KAB |
5/8/2019 |
|
|
|
#22543 |
Working branch |
| feature/22701_RequestMessage_t_AdditionalTests |
ELF |
11/08/209 |
|
|
|
#22701 |
Only changes to RequestMessage_t, built off of feature/22532_RequestAcknowledgements 11/22/2019, ELF: Merge conflicts with develop |
| feature/22736_ConfigurationDiagrames |
ELF |
6/20/2019 |
|
|
|
#22736 |
|
| feature/22852_CFG_SequenceID_RequestMode |
ELF |
7/1/2019 |
|
|
|
#22852 |
|
| feature/22882_TransferWrapper_ConnectionRobustness |
ELF |
7/16/2019 |
|
|
|
#22882 |
|
| feature/22925_RemoveCoutCerr |
ELF |
11/05/2019 |
|
|
|
#22925 |
|
| feature/22956_BuildInfo_TRACEBuildInfo |
ELF |
11/05/2019 |
|
|
|
#22956 |
|
| feature/23131_FragWatcher_MissingFragDetail |
KAB |
8/15/2019 |
|
|
|
#23131 |
|
| feature/23284_Core_ReplaceLogMessage |
ELF |
10/11/2019 |
|
|
|
#23284 |
|
| feature/23416_MetricLevelOverhaul |
ELF |
10/31/2019 |
|
|
|
#23416 |
|
| feature/23599_ArtdaqInput_EliminateExtraMemcpy |
ELF |
11/13/2019 |
|
|
|
#23599 |
Branch based off of bugfix/23426_ArtdaqSharedMemoryService |
| feature/23646_simple_metric_sender |
ELF |
11/22/2019 |
|
|
|
#23646 |
|
| feature/3186_SMEM_FragmentIDChecking |
ELF |
4/9/2019 |
|
|
|
#3186 |
11/22/2019, ELF: Merge conflicts with develop |
| feature/BoardReaderCore_RemoveBRSyncStatKey |
ELF |
9/5/2018 |
|
|
|
#20745 |
|
| feature/DSM_DRM_RankAndAppNameMetrics |
ELF |
1/25/2019 |
|
|
|
#21771 |
|
| feature/DataLoggerCore_PotentiallyUninitializedMetricPsetFix |
ELF |
10/10/2018 |
|
|
|
#21105 |
|
| feature/FixesForIssues_21267_21591 |
KAB |
1/18/2019 |
|
|
|
Likely working branch |
|
| feature/PassDroppedDataPointerToSMEM |
ELF |
8/24/2018 |
|
|
|
#21089 |
|
| feature/RoutingMasterCore_MetricAndLogImprovements |
ELF |
9/5/2018 |
|
|
|
#20746 |
|
| feature/RoutingWaitTimeMetric_fix |
ELF |
8/23/2018 |
|
|
|
#21093 |
|
| feature/SMEM_EventBuildingTimeMetric |
ELF |
9/13/2018 |
|
|
|
#20747 |
|
| feature/SMEM_ManualModeFixForMu2e |
ELF |
10/5/2018 |
|
|
|
#21095 |
|
| feature/SMEM_RenameMisleadingMetric |
ELF |
9/13/2018 |
|
|
|
#21096 |
|
| feature/SWIGBindingsForMetricsAndTRACEMessages |
ELF |
11/26/2018 |
|
|
|
#21799 |
|
| feature/SharedMemoryReader_CustomTimestampEventIDFunctions |
ELF |
9/12/2018 |
|
|
|
#20816 |
|
| feature/SharedMemoryReader_RawEventHeaderInArtEvent |
ELF |
10/8/2018 |
|
KAB - working on validation |
|
#20815 |
|
| feature/ShmemTransfer_ConfigureStaleBufferTimeout |
ELF |
10/18/2018 |
|
|
|
#21191 |
|
| for_dune-artdaq |
|
1/23/2019 |
|
|
|
#21814 |
Merged into develop 7/16/2019. Still active. |
| for_novabeamlinedaq |
|
|
|
|
|
|
|
| working/22535_protoDFO_testing |
KAB |
6/12/2019 |
|
|
|
#22535 |
Work in progress |
| working/RequestAcksWithMultFragsPerRead |
KAB |
6/7/2019 |
|
|
|
#22535 |
Work in progress |
| Branch |
Author(s) |
Last Commit |
Reviewer(s) |
Validation Method |
Date Merged into Develop |
Redmine Issue |
Notes |
| feature/21889_RunASANOnArtdaq |
ELF |
2/12/2019 |
|
|
Before 3/20/2019 |
#21889 |
|
| feature/21923_MultipleLoggersToDispatcher |
KAB |
|
ELF |
Code Review |
5/14/2019 |
#21923 |
Only changes to simple_test_configs |
| feature/22154_art_Events_From_Subsystems |
ELF |
7/22/2019 |
|
|
|
#22154 |
Work in progress |
| feature/22236_SimpleSubsystems_Fixes |
ELF |
3/28/2019 |
|
|
|
#22236 |
|
| feature/22291_DispatcherConfigArtBlock |
KAB |
4/04/2019 |
ELF |
Code Review |
5/14/2019 |
#22291 |
Only changes to simple_test_configs |
| feature/22364_artBlockForSimpleTestConfigs |
ELF |
7/03/2019 |
|
|
|
#22364 |
Despite issue being in the "Closed" state, this branch is not yet merged into develop! |
| feature/22530_TokenReceiver |
KAB |
5/23/2019 |
ELF |
Run testing |
5/31/2019 |
#22530 |
|
| feature/22823_simple_test_configs_FileMetricsToLogRoot |
ELF |
7/10/2019 |
RDR |
ran demo w/ daqinterface branch and checked that metric files were under daqlogs dir |
7/10/2019 |
#22823 |
|
| feature/22879_AddBootAndKnownBRListForMu2edaq |
ELF |
7/11/2019 |
RDR |
run_demo.sh |
7/16/2019 |
#22879 |
seems to be an issue with run_integration_tests.sh w/ just config and brlist_name, but copying cmd line it outputs works |
| feature/23043_multiple_products_and_setup_param |
JCF |
8/07/2019 |
|
|
~8/7/2019 |
#23043 |
|
| feature/23173_combine_configs |
KAB |
9/04/2019 |
ELF |
Review & Run |
10/23/2019 |
#23173 |
|
| feature/CFG_MultipleFragmentsPerRead |
ELF |
12/07/2018 |
|
|
|
#21472 |
|
| feature/Issue21769_SBN_Multicast_Tests |
KAB,JCF |
10/01/2019 |
KAB |
artdaq-demo testing in several experiment environments |
10/02/19 |
#21769, #22226 |
Currently, this branch has host-specific sample parameters. The branch should only be merged after bookkeeping has been implemented for those params. |
| feature/config_database_improvements |
JCF |
9/14/2017 |
|
|
|
|
Old, but the last commit may come in useful at some point |
| feature/issue22994_transition_order |
JCF |
8/17/2019 |
ELF |
Code Review & test |
10/27/2019 |
#22994 |
Minor code edit during review, John should check and merge into develop when ready |
| feature/large_container_test |
ELF |
9/07/2018 |
|
|
|
#20743 |
Probably a candidate for subconfigs treatment |
| feature/mu2edaq_stresstest |
|
7/31/2018 |
|
|
|
#20388 |
|
| feature/protodune |
|
9/25/2018 |
|
|
|
DO NOT TOUCH, DO NOT MODIFY |
|
| feature/protodune_mock_system_with_delay |
|
8/20/2018 |
|
|
|
#20388 |
|
| feature/reportMetric |
|
7/09/2018 |
|
|
|
#21066 |
|
| feature/sbnd |
|
10/01/2018 |
|
|
|
Essentially a way to save Gray and Bill's local mods |
|
| feature/simple_test_config_UseRootDAQOut |
ELF |
10/11/2018 |
N/A |
N/A |
2/18/2019 |
#21115 |
Only changes to simple_test_config output modules |
| working/22535_protoDFO_testing |
KAB |
6/12/2019 |
|
|
|
#22535 |
Work in progress |