CI improvements and consistent treatment of environment

.github/workflows/key4hep_build.yml

@@ -30,5 +30,8 @@ jobs:
       with:
         name: k4GeneratorsConfig_report_${{ matrix.build_type }}_${{ matrix.image }}
         path: |
-          test/xsectionSummary.dat
+          test/GenerationSummary.dat
+          test/*.png
+          test/*.pdf
+          test/*.root
           test/output/*

CMakeLists.txt

@@ -43,7 +43,7 @@ set(basic_libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
 set(bindir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
 set(libdir ${basic_libdir})
 set_target_properties(convertHepMC2EDM4HEP PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/$<0:>)
-set_target_properties(xsectionSummary PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/$<0:>)
+set_target_properties(eventGenerationSummary PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/$<0:>)
 set_target_properties(pythiaRunner PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/$<0:>)
 set_target_properties(pythiaLHERunner PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/$<0:>)
 set_target_properties(key4HEPAnalysis PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/$<0:>)

examples/FermionProductionBST.yaml

@@ -1,5 +1,4 @@
 Generators:
-  - Whizard
   - Madgraph
 
 OutputFormat: hepmc3

k4GeneratorsConfig/CMakeLists.txt

@@ -54,19 +54,19 @@ install(TARGETS convertHepMC2EDM4HEP
 )
 
 set(xsection_sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/xsectionSummary.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/eventGenerationSummary.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/src/xsection.cxx
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/xsectionCollection.cxx
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/xsection2Root.cxx
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/differential.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/eventGenerationCollections.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/eventGenerationCollections2Root.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/analysisHistos.cxx
 )
 
-add_executable(xsectionSummary ${xsection_sources})
-target_link_libraries(xsectionSummary PRIVATE
+add_executable(eventGenerationSummary ${xsection_sources})
+target_link_libraries(eventGenerationSummary PRIVATE
   EDM4HEP::edm4hep podio::podioRootIO ROOT::Tree ROOT::Hist ROOT::Gpad
 )
 
-install(TARGETS xsectionSummary
+install(TARGETS eventGenerationSummary
   EXPORT k4GeneratorsConfigTargets
   DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )

k4GeneratorsConfig/src/WriterEDM4HEP.cxx

@@ -35,7 +35,7 @@ namespace HepMC3 {
 WriterEDM4HEP::WriterEDM4HEP(const std::string& filename, std::shared_ptr<GenRunInfo> run)
     : m_file(filename), m_stream(&m_file), m_particle_counter(0), m_edm4hepWriterClosed(false),
       m_edm4hepWriter(filename) {
-  HEPMC3_WARNING("WriterEDM4HEP::WriterEDM4HEP: the conversion to EDM4HEP is still being developed")
+  //  HEPMC3_WARNING("WriterEDM4HEP::WriterEDM4HEP: the conversion to EDM4HEP is still being developed")
   set_run_info(run);
   if (!run_info())
     set_run_info(std::make_shared<GenRunInfo>());

k4GeneratorsConfig/src/analysisHistos.cxx

@@ -0,0 +1,89 @@
+#include "analysisHistos.h"
+#include <iostream>
+#include <memory>
+
+#include "TFile.h"
+#include "TKey.h"
+#include "TROOT.h"
+
+k4GeneratorsConfig::analysisHistos::analysisHistos()
+    : m_sqrts(0.), m_generator(""), m_process(""), m_file(""), m_isValid(false) {}
+k4GeneratorsConfig::analysisHistos::analysisHistos(const analysisHistos& theOriginal) {
+  if (this != &theOriginal) {
+    m_sqrts = theOriginal.m_sqrts;
+    m_generator = theOriginal.m_generator;
+    m_process = theOriginal.m_process;
+    m_file = theOriginal.m_file;
+    m_isValid = theOriginal.m_isValid;
+    for (auto histo : theOriginal.m_listOfHists) {
+      m_listOfHists.push_back(new TH1D(*histo));
+    }
+  }
+}
+k4GeneratorsConfig::analysisHistos& k4GeneratorsConfig::analysisHistos::operator=(const analysisHistos& theOriginal) {
+  if (this != &theOriginal) {
+    m_sqrts = theOriginal.m_sqrts;
+    m_generator = theOriginal.m_generator;
+    m_process = theOriginal.m_process;
+    m_file = theOriginal.m_file;
+    m_isValid = theOriginal.m_isValid;
+    for (auto hist : m_listOfHists) {
+      delete hist;
+    }
+    m_listOfHists.clear();
+    for (auto hist : theOriginal.m_listOfHists) {
+      m_listOfHists.push_back(new TH1D(*hist));
+    }
+  }
+
+  return *this;
+}
+k4GeneratorsConfig::analysisHistos::~analysisHistos() {}
+bool k4GeneratorsConfig::analysisHistos::processFile() {
+
+  // open the root file
+  std::unique_ptr<TFile> theFile(TFile::Open(m_file.c_str()));
+  if (!theFile || theFile->IsZombie())
+    return false;
+
+  // retrieve the RunInfo for the weight names, there should only be 1 entry per Run
+  TIter keyList(theFile->GetListOfKeys());
+  TKey* key;
+  while ((key = (TKey*)keyList())) {
+    TClass* cl = gROOT->GetClass(key->GetClassName());
+    if (cl->InheritsFrom("TH1")) {
+      m_listOfHists.push_back(new TH1D(*(TH1D*)key->ReadObj()));
+      // turn ownership over to analysisHistos:
+      m_listOfHists[m_listOfHists.size() - 1]->SetDirectory(0);
+    }
+  }
+
+  return true;
+}
+void k4GeneratorsConfig::analysisHistos::setSQRTS(double sqrts) { m_sqrts = sqrts; }
+void k4GeneratorsConfig::analysisHistos::setGenerator(std::string gen) { m_generator = gen; }
+void k4GeneratorsConfig::analysisHistos::setProcess(std::string proc) { m_process = proc; }
+void k4GeneratorsConfig::analysisHistos::setFile(std::string file) {
+  m_file = file;
+  m_isValid = processFile();
+}
+double k4GeneratorsConfig::analysisHistos::SQRTS() { return m_sqrts; }
+std::string k4GeneratorsConfig::analysisHistos::Generator() { return m_generator; }
+std::string k4GeneratorsConfig::analysisHistos::Process() { return m_process; }
+std::string k4GeneratorsConfig::analysisHistos::File() { return m_file; }
+bool k4GeneratorsConfig::analysisHistos::isValid() { return m_isValid; }
+TH1D* k4GeneratorsConfig::analysisHistos::TH1DHisto(unsigned int iHisto) {
+  return m_listOfHists.size() > 0 ? m_listOfHists[iHisto] : 0;
+}
+const std::vector<TH1D*>& k4GeneratorsConfig::analysisHistos::TH1DHistos() const { return m_listOfHists; }
+unsigned int k4GeneratorsConfig::analysisHistos::NbOf1DHistos() { return m_listOfHists.size(); }
+void k4GeneratorsConfig::analysisHistos::Print() {
+  std::cout << std::endl;
+  std::cout << "AnalysisHistos object summary:" << std::endl;
+  std::cout << "File                : " << m_file << std::endl;
+  std::cout << "Process             : " << m_process << std::endl;
+  std::cout << "SQRTS               : " << m_sqrts << std::endl;
+  std::cout << "Generator           : " << m_generator << std::endl;
+  std::cout << "analysisHistos valid: " << m_isValid << std::endl;
+  std::cout << std::endl;
+}

k4GeneratorsConfig/src/differential.h → k4GeneratorsConfig/src/analysisHistos.h

@@ -1,17 +1,17 @@
-#ifndef K4GENERATORSCONFIG_DIFFERENTIAL_H
-#define K4GENERATORSCONFIG_DIFFERENTIAL_H
+#ifndef K4GENERATORSCONFIG_ANALYSISHISTOS_H
+#define K4GENERATORSCONFIG_ANALYSISHISTOS_H
 
 #include <string>
 
 #include "TH1D.h"
 
 namespace k4GeneratorsConfig {
-class differential {
+class analysisHistos {
 public:
-  differential();
-  differential(const differential&);
-  differential& operator=(const differential&);
-  ~differential();
+  analysisHistos();
+  analysisHistos(const analysisHistos&);
+  analysisHistos& operator=(const analysisHistos&);
+  ~analysisHistos();
 
   bool processFile();
 
@@ -26,6 +26,7 @@ class differential {
   std::string File();
   bool isValid();
   TH1D* TH1DHisto(unsigned int);
+  const std::vector<TH1D*>& TH1DHistos() const;
   unsigned int NbOf1DHistos();
 
   void Print();