Project

General

Profile

Artdaq repository branches » History » Version 788

Version 787 (Eric Flumerfelt, 09/23/2020 12:29 PM) → Version 788/825 (Eric Flumerfelt, 09/25/2020 04:10 PM)

h1. Artdaq repository branches

{{toc}}

Notes:
# "Likely Working Branch" means that based on the branch name, I have assumed that the branch is not for the purpose of implementing a feature or bug fix, but rather serves as a checkpoint of the code for a specific purpose (running experiments, testing, etc).
# All dates in US format (MM/DD/YYYY)

h2. artdaq_core Branches

|_. 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/24375_RawDataType_ByteTest | ELF | 05/04/2020 | | | | #24375 | This branch is for testing only, we are not considering including it in artdaq-core at the moment. (However some of the changes that allow us the flexibility to change the underlying Fragment data type may be considered) |
| feature/FreezeTraceBufferOnDetachWithException | ELF | 8/24/2018 | | | | #21073 | |
| 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 |

h2. artdaq_utilities Branches

|_. Branch |_.Author(s)|_.Last Commit|_.Reviewer(s)|_.Validation Method|_.Date Merged into Develop|_. Redmine Issue |_. Notes|
| feature/22326_MetricPlugin_FixParameterDocumentation | ELF | 4/8/2019 | | | | #22326 | |
| feature/22543_Working_Dev2FDA_Merges | KAB | 5/8/2019 | | | | #22543 | Working branch |
| feature/22688_FileMetric_TimestampInFilename | ELF | 6/5/2019 | | | | #22688 | |
| feature/22925_RemoveCoutCerr | ELF | 11/05/2019 | | | | #22925 | |
| feature/22938_metric_name | RDR & ELF | 9/30/2019 | | | | #22938 | |
| feature/23067_Publish_Inhibit_Messages | KAB | in progress | | | | #23067 | |
| feature/23416_MetricLevelOverhaul | ELF | 10/31/2019 | | | | #23416 | |
| feature/23638_MetricPlugin_sendMetric_time | ELF | 12/31/2019 | | | | #23638 | |
| feature/23880_SystemMetricCollector_DetailedSystemCPU | ELF | 1/14/2020 | | | | #23880 | |
| feature/TRACE_Metric | ELF | 9/6/2018 | | | | #20751 | |
| for_dune-artdaq | KAB | 2/12/2019 | | | | #21814 | Active working branch for protodune |

h2. artdaq_mfextensions Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes|

h2. artdaq_epics_plugin Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes|
| feature/22938_metric_name | ELF | 9/30/2019 | | | | #22938 | |
| feature/23638_MetricPlugin_sendMetric_time | ELF | 12/31/2019 | | | | #23638 | |
| feature/FragmentGenerator | ELF | 12/15/2017 | | | | #21055 | |

h2. artdaq_ganglia_plugin Branches

|_. Branch |_.Author(s)|_.Last Commit|_.Reviewer(s)|_.Validation Method|_.Date Merged into Develop|_.Redmine Issue|_.Notes|
| feature/22938_metric_name | ELF | 9/30/2019 | | | | #22938 | |
| feature/23638_MetricPlugin_sendMetric_time | ELF | 12/31/2019 | | | | #23638 | |

h2. artdaq_pcp_mmv_plugin Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes|
| feature/22938_metric_name | ELF | 9/30/2019 | | | | #22938 | |
| feature/23638_MetricPlugin_sendMetric_time | ELF | 12/31/2019 | | | | #23638 | |

h2. artdaq Branches

|_. 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/24242_SMEM_skip_graceful_wait_for_Dispatcher | ELF | 03/27/2020 | | | | #24242 | |
| bugfix/24970_BoardReader_startOrdering | ELF | 09/14/2020 | | | | #24970 | |
| bugfix/25007_ArtdaqInputHelper_RemoveNothing | ELF | 09/23/2020 | | | | #25007 | |
| 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 | ELF, 8/10/2020: This branch is obsolete. FragmentBuffer should be checked to see if it needs the same functionality. |
| feature/22220_SharedMemoryReader_EventNumberInTRACEs | ELF | 3/26/2019 | | | | #22220 | ELF, 3/24/2020: This branch is obsolete. ArtdaqInputHelper should be checked to see if it needs the same functionality. |
| 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 | ELF, 3/24/2020: This branch is obsolete. I don't know if there are any changes here that should be made in ArtdaqFragmentNamingService. |
| feature/22531_DataSenderManager_RankParameterToSendFragment | ELF | 5/30/2019 | | | | #22531 | |
| feature/22532_RequestAcknowledgements | ELF | 5/15/2019 | | | | #22532 | ELF, 9/16/2020: Merge issues with develop |
| feature/22533_CFG_getNextWithDestinations | KAB | 6/5/2019+ | | | | #22533 | ELF, 9/16/2020: Merge issues with develop. 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 | ELF, 9/16/2020: Merge issues with develop. Only changes to RequestMessage_t, built off of feature/22532_RequestAcknowledgements |
| feature/22736_ConfigurationDiagrames | ELF | 6/20/2019 | | | | #22736 | |
| feature/22925_RemoveCoutCerr | ELF | 11/05/2019 | | | | #22925 | |
| feature/22956_BuildInfo_TRACEBuildInfo | ELF | 11/05/2019 | | | | #22956 | |
| feature/23131_FragWatcher_MissingFragDetail | KAB | 1/7/2020 | ELF | | | #23131 | Additional changes on branch by ELF, needs further review |
| feature/23416_MetricLevelOverhaul | ELF | 10/31/2019 | | | | #23416 | ELF, 9/16/2020: Merge issues with develop |
| feature/24375_ByteTest_FixesForArtdaq | ELF | 05/05/2020 | | | | #24375 | Most of the changes on this branch are simply clean-up of places where we made assumptions about the Fragment underlying data type |
| feature/24566_ShmemOutputModules | ELF | 06/26/2020 | | | | #24566 | |
| feature/24982_RoutingImprovements | ELF | 09/25/2020 | | | | #24982 | |
|
feature/3186_SMEM_FragmentIDChecking | ELF | 4/9/2019 | | | | #3186 | |
| 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/SharedMemoryReader_CustomTimestampEventIDFunctions | ELF | 9/12/2018 | | | | #20816 | ELF, 3/24/2020: Now obsolete. May have to be re-implemented in ArtdaqInputHelper. |
| 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 | | | | | | | |
| for_sbndaq-artdaq | | | | | | | |
| working/22535_protoDFO_testing | KAB | 6/12/2019 | | | | #22535 | Work in progress |
| working/RequestAcksWithMultFragsPerRead | KAB | 6/7/2019 | | | | #22535 | Work in progress |

h2. artdaq_core_demo Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes|
| feature/24810_FragmentType_ExplicitlySetTypeCodes | ELF | 08/17/2020 | | | | #24810 | |

h2. artdaq_demo Branches

|_. Branch |_.Author(s)|_.Last Commit|_.Reviewer(s)|_.Validation Method|_.Date Merged into Develop|_.Redmine Issue|_.Notes|
| feature/22379_ToySimulator_TestInvalidTimestamp | ELF | 4/19/2019 | | | | #22379 | |
| feature/22456_NthFragmentIDInput | ELF | 6/12/2019 | | | | #22456 | ELF 3/24/20: This branch may be obsolete |
| feature/22736_ConfigurationDiagrams | ELF | 6/24/2019 | | | | #22736 | |
| feature/22925_RemoveCoutCerr | ELF | 11/05/2019 | | | | #22925 | |
| feature/23356_CheckIntegrity_TestOldFragmentVersions | ELF | 9/30/2019 | | | | #23356 | |
| feature/23416_MetricLevelOverhaul | ELF | 10/31/2019 | | | | #23416 | |
| feature/23479_qms_NoPullOption | ELF | 10/28/2019 | | | | #23479 | |
| feature/23574_run_integration_tests_cmdline | ELF | 11/07/2019 | | | | #23574 | |
| feature/SharedMemoryReader_CustomTimestampEventIDFunctions| ELF | 9/12/2018 | | | | #20816 | ELF 3/24/20: This branch may be obsolete |
| feature/WFViewer_DynamicMode | ELF | 12/06/2018 | | | | #21800 | |

h2. artdaq_database Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes|
| bug/23225_return_errors_from_bulkoperations | GAL|9/11/2019 | JCF | |9/16/2019 | #23225 | |
| feature/23523_mongodb_performance |GAL |12/12/2019 | GAL,RR | tested with otsdaq |2/5/2019 | #23523 | released with v1_04_83 |
| feature/23490_last_archived_run_number |GAL |8/28/2019 | | | | #23490 | |
| feature/22861_upgrade_to_python3 |GAL |12/04/2019 | | | | #22861 | |
| feature/23184_build_with_mrb |RDR |8/28/2019 | | |8/28/2019 | #23184 | released with v1_04_76 |
| bug/23455_not_implemented_exception |GAL |10/22/2019 | RDR | |1/11/2019 | #23455 | released with v1_04_79 |
| bug/23489_findGlobalConfigurations_runtime_error|GAL |12/12/2019 | | |12/12/2019 | #23489 | released with v1_04_81 |

h2. artdaq_daqinterface Branches

|_. Branch |_.Author(s)|_.Last Commit|_.Reviewer(s)|_.Validation Method|_.Date Merged into Develop|_.Redmine Issue|_.Notes|
| feature/24189_prepend_boardreader_start | JCF | 3/18/2020 | GAL | Demo testing, ps | 03/18/2020 | #24189 | |
| feature/24155_floor_on_event_size | JCF | 3/9/2020 | KAB | Demo and PDSP tests | 3/16/2020 | #24155 | |
| feature/24129_trace_script | JCF | 3/6/2020 | GAL | Demo testing | 3/13/2020 | #24129 | Tested with for_sbndaq-artdaq:v3_07_02CH11c7c4. |
| bugfix/24113_messageviewer_severity_levels | JCF | 3/2/2020 | GAL | Demo testing | 3/6/2020 | #24113 | Tested with for_sbndaq-artdaq:v3_07_02CH9fad5e. |
| bugfix/24105_chronological_ordering_of_run_records | JCF | 3/4/2020 | GAL | Demo testing | 3/6/2020 | #24105 | Tested with for_sbndaq-artdaq:v3_07_02CH9fad5e. |
| feature/issue24053_nonsending_boardreaders | JCF | 2/19/2020 | | | | #24053 | |
| bugfix/24089_multiple_dataloggers_allDLtoDI | ELF | 02/28/2020 | | | | #24089 | |
| feature/23979_advanced_memory_usage_default | JCF | 2/25/2020 | KAB | Demo testing | 2/27/2020 | #23979 | |
| feature/21889_RunASANOnArtdaq | ELF | 2/12/2019 | | | <3/20/2019 | #21889 | |
| feature/22154_art_Events_From_Subsystems | ELF | 7/22/2019 | GAL | run_integration_tests, event dump| 03/18/2020 | #22154 | |
| feature/22154_SingleInputSource | ELF | 03/11/2020 | GAL | run_integration_tests, event dump| 03/18/2020 | #22154 | Pair with artdaq:feature/22154_ArtdaqInput_SingleInputSource |
| feature/22364_artBlockForSimpleTestConfigs | ELF | 7/03/2019 | | | | #22364 | Despite issue being in the "Closed" state, this branch is *not* yet merged into develop! |
| feature/23482_unique_run_number | JCF | 12/09/2019 | | | | #23482 | |
| feature/24375_ByteTest_SettingsForByteTest | ELF | 05/05/2020 | | | | #24375 | Allows advanced_memory_management to work with different Fragment underlying data types |
| feature/CFG_MultipleFragmentsPerRead | ELF | 12/07/2018 | | | | #21472 | |
| feature/config_database_improvements | JCF | 9/14/2017 | | | | | Old, but the last commit may come in useful at some point|
| feature/23784_send_to_messageviewer | JCF | 12/31/2019| GAL | Code review & run_demo | 1/31/2020 | #23784 | |
| feature/24082_ArtdaqFragmentNamingService | ELF | 3/04/2020 | RDR | run_demo, event dump | 3/05/2020 | #24082 | |
| feature/24398_RequestReceiver_CfgChanges | ELF | 05/12/2020 | | | | #24398 | |
| feature/24541_SubsystemRequests | ELF | 06/17/2020 | RDR | srcs/artdaq_demo/tools/run_integration_tests.sh --config mu2e_sample_system | 6/19/2020| #24541 | |
| 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 | |
| working/22535_protoDFO_testing | KAB | 6/12/2019 | | | | #22535 | Work in progress |

h2. artdaq_node_server Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes|
| feature/SankeyFlowDiagram | ELF | 6/4/2019 | | | | #20569 | |
| feature/22736_ConfigurationDiagrams | ELF | 7/16/2019 | | | | #22726 | |

h2. artdaq_mpich_plugin Branches

|_. Branch |_. Author(s)|_. Last Commit|_. Reviewer(s)|_. Validation Method |_. Date Merged into Develop|_. Redmine Issue|_. Notes|
| feature/22533_CFG_getNextWithDestinations | ELF | 9/5/2019 | | | | #22533 | Needed for artdaq:feature/22533_CFG_getNextWithDestinations |
| feature/23386_MPI_AutoConnect | ELF | 10/11/2019 | | | | #23386 | Work in progress |
| feature/22543_Working_Dev2FDA_Merges | KAB | 5/8/2019 | | | | #22543 |Working branch |
| for_dune-artdaq | KAB | 10/5/2018 | | | | #21814 |ProtoDUNE working branch |

h2. artdaq_demo_hdf5 Branches

|_. Branch |_. Author(s) |_. Last Commit |_. Reviewer(s) |_. Validation Method |_. Date Merged into Develop |_. Redmine Issue |_. Notes |

h2. [[Branch Graveyard]]