Merged changes from previous branch

Author: cholmcc

Detectors/ITSMFT/ITS/postprocessing/studies/src/AvgClusSize.cxx

@@ -266,7 +266,7 @@ void AvgClusSizeStudy::prepareOutput()
 
 void AvgClusSizeStudy::setStyle()
 {
-  gStyle->SetPalette(kRainbow);
+  gStyle->SetPalette(kRainBow);
   std::vector<int> colors = {1, 2, 3, 4, 6, 7, 41, 47};
   std::vector<int> markers = {2, 3, 4, 5, 25, 26, 27, 28, 32};
   for (int i = 0; i < mAvgClusSizeCEtaVec.size(); i++) {

Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysis.cxx

@@ -20,6 +20,7 @@
 #include "HitAnalysis/HitAnalysis.h"
 
 #include <fairlogger/Logger.h> // for LOG
+#include <FairRootManager.h>
 
 #include <TH1.h> // for TH1, TH1D, TH1F
 #include <TFile.h>

Steer/include/Steer/O2RunSim.h

@@ -60,7 +60,7 @@ class O2RunSim : public FairRunSim
     fRootManager->InitSink();
 
     // original FairRunSim follows
-    FairGeoLoader* loader = new FairGeoLoader(fLoaderName->Data(), "Geo Loader");
+    FairGeoLoader* loader = new FairGeoLoader(fLoaderName.Data(), "Geo Loader");
     FairGeoInterface* GeoInterFace = loader->getGeoInterface();
     GeoInterFace->SetNoOfSets(ListOfModules->GetEntries());
     GeoInterFace->setMediaFile(MatFname.Data());

Utilities/rANS/benchmarks/bench_ransTPC.cxx

@@ -378,7 +378,15 @@ int main(int argc, char* argv[])
     LOG(info) << "######################################################";
   });
   writer.EndObject();
-  writer.Flush();
+  // Not implemented in all version of rapidjson 1.1.0 Seems like
+  // rapidjson developers does not update version number when making
+  // API changes - sigh.
+  // 
+  // writer.Flush();
+  //
+  // We call flush on the output stream instead
+  //
+  stream.Flush();
   of.close();
 
   // writerFrequencies.EndObject();
@@ -387,4 +395,4 @@ int main(int argc, char* argv[])
   // writerRenormed.EndObject();
   // writerRenormed.Flush();
   // ofRenormed.close();
-};
+};

run/CMakeLists.txt

@@ -121,6 +121,14 @@ o2_add_executable(mctracks-to-aod
                   SOURCES o2sim_mctracks_to_aod.cxx
                   PUBLIC_LINK_LIBRARIES O2::Framework O2::SimulationDataFormat)
 
+o2_add_executable(mc-to-hepmc
+                  COMPONENT_NAME aod
+                  SOURCES o2aod_mc_to_hepmc.cxx
+                  PUBLIC_LINK_LIBRARIES
+		    O2::Framework
+		    O2::SimulationDataFormat
+		    O2::Generators)
+
 o2_add_dpl_workflow(mctracks-to-aod-simple-task
                     SOURCES SimExamples/McTracksToAOD/mctracks_to_aod_simple_task.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework

run/SimExamples/README.md

@@ -11,6 +11,7 @@
 * \subpage refrunSimExamplesAdaptive_Pythia8
 * \subpage refrunSimExamplesAliRoot_Hijing
 * \subpage refrunSimExamplesAliRoot_AMPT
+* \subpage refrunSimExamplesHepMC
 * \subpage refrunSimExamplesHepMC_STARlight
 * \subpage refrunSimExamplesJet_Embedding_Pythia8
 * \subpage refrunSimExamplesStepMonitoringSimple1
@@ -20,4 +21,5 @@
 * \subpage refrunSimExamplesSelective_Transport_pi0
 * \subpage refrunSimExamplesCustom_EventInfo
 * \subpage refrunSimExamplesMCTrackToDPL
+* \subpage refrunSimExamplesTParticle
 /doxy -->