add AnalysisTree converter tests

analysis/common/analysis_tree_converter/CMakeLists.txt

@@ -88,7 +88,7 @@ ADD_DEFINITIONS(${DEFINITIONS})
 
 GENERATE_LIBRARY()
 
-Install(FILES ../../../macro/analysis/common/analysis_tree_converter/run_treemaker.C
+Install(FILES ../../../macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
         DESTINATION share/cbmroot/macro/analysis_tree
        )
 

external/InstallAnalysisTreeQA.cmake

@@ -30,7 +30,7 @@ ExternalProject_Add(ANALYSISTREEQA
         -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
         -DCMAKE_CXX_STANDARD=11
         -DROOTSYS=${SIMPATH}
-	-DUSEBOOST=TRUE
+	    -DUSEBOOST=TRUE
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
         INSTALL_COMMAND  ${CMAKE_COMMAND} --build . --target install
         )

macro/C2F/CMakeLists.txt

@@ -4,6 +4,7 @@ GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/C2F/c2f_transport.C)
 GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/run/run_digi.C ${MACRO_DIR})
 GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/run/run_reco_event.C ${MACRO_DIR})
 GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/analysis/PWGC2F/flow/DataTreeCbmInterface/macro/run_treemaker.C ${MACRO_DIR})
+GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C ${MACRO_DIR})
 GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/external/DataTreeQA/macro/PopulateQAConfigurations.C ${MACRO_DIR})
 GENERATE_CBM_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/external/DataTreeQA/macro/RunDataTreeQA.C ${MACRO_DIR})
 
@@ -61,7 +62,16 @@ If( ($ENV{ctest_model} MATCHES Nightly) OR ($ENV{ctest_model} MATCHES Weekly) )
     set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_c2f_ana})
     Set(fixture_c2f_datatree fixture_c2f_datatree_${testname})
     set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_c2f_datatree})
-  
+
+    # --- AnalysisTree
+    Set(testname analysis_tree_maker_${setup})
+    Add_Test(${testname} ${MACRO_DIR}/run_analysis_tree_maker.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\")
+    Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
+    Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
+    set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_c2f_ana})
+    Set(fixture_c2f_analysistree fixture_c2f_analysistree_${testname})
+    set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_c2f_analysistree})
+
     # --- DataTreeQA input
     Set(testname c2f_datatreeqa_input_${setup})
     Add_Test(${testname} ${MACRO_DIR}/PopulateQAConfigurations.sh)

macro/analysis/common/analysis_tree_converter/run_treemaker.C → macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C

 
-void run_treemaker(
-  TString inputDir =
-    "/home/vklochkov/Data/cbm/apr20_fr_18.2.1_fs_jun19p1/cbmroot_new/data/",
-  TString dataSet   = "test",
-  TString setupName = "sis100_electron") {
-  const std::string system = "Au+Au";
+void run_analysis_tree_maker(Int_t nEvents     = 2,
+                             TString dataSet   = "test",
+                             TString setupName = "sis100_electron") {
+  const std::string system = "Au+Au";  // TODO can we read it automatically?
   const float beam_mom     = 12.;
 
   // --- Logger settings ----------------------------------------------------
@@ -13,17 +11,16 @@ void run_treemaker(
   // ------------------------------------------------------------------------
 
   // -----   Environment   --------------------------------------------------
-  const TString myName =
-    "run_treemaker";  // this macro's name for screen output
+  const TString myName = "run_analysis_tree_maker";
   const TString srcDir = gSystem->Getenv("VMCWORKDIR");  // top source directory
   // ------------------------------------------------------------------------
 
   // -----   In- and output file names   ------------------------------------
-  TString traFile = inputDir + dataSet + ".tra.root";
-  TString rawFile = inputDir + dataSet + ".event.raw.root";
-  TString recFile = inputDir + dataSet + ".rec.root";
-  TString geoFile = inputDir + dataSet + ".geo.root";
-  TString parFile = inputDir + dataSet + ".par.root";
+  TString traFile = dataSet + ".tra.root";
+  TString rawFile = dataSet + ".event.raw.root";
+  TString recFile = dataSet + ".rec.root";
+  TString geoFile = dataSet + ".geo.root";
+  TString parFile = dataSet + ".par.root";
   const std::string outFile =
     dataSet.Data() + std::string(".analysistree.root");
   // ------------------------------------------------------------------------
@@ -137,7 +134,7 @@ void run_treemaker(
   run->Init();
 
   std::cout << "Starting run" << std::endl;
-  run->Run();
+  run->Run(0, nEvents);
   // ------------------------------------------------------------------------
 
   timer.Stop();