From 5c97e70d7fee3e2a7040c9c1a322e88897c31034 Mon Sep 17 00:00:00 2001
From: Placido Fernandez Declara <placido.fernandez@cern.ch>
Date: Wed, 1 Dec 2021 15:50:39 +0100
Subject: [PATCH] remove static lciostorer to allow multi-threading

---
 include/LcfiplusProcessor.h |  5 ++---
 src/LcfiplusProcessor.cc    | 34 +++++++++-------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/include/LcfiplusProcessor.h b/include/LcfiplusProcessor.h
index 17b615b4..016c67f3 100644
--- a/include/LcfiplusProcessor.h
+++ b/include/LcfiplusProcessor.h
@@ -55,9 +55,8 @@ class LcfiplusProcessor : public Processor, public lcfiplus::EventStoreObserver
 
  private:
 
-  // lciostorer singleton
-  static lcfiplus::LCIOStorer* _lcio;
-  bool _lcioowner;
+  // lciostorer
+  lcfiplus::LCIOStorer* _lcio;
 
   int _useMcp;
 
diff --git a/src/LcfiplusProcessor.cc b/src/LcfiplusProcessor.cc
index 37278fa6..ba15a794 100644
--- a/src/LcfiplusProcessor.cc
+++ b/src/LcfiplusProcessor.cc
@@ -23,9 +23,6 @@ using namespace lcfiplus ;
 
 LcfiplusProcessor aLcfiplusProcessor ;
 
-// static object initialization
-LCIOStorer* LcfiplusProcessor::_lcio = 0;
-
 LcfiplusProcessor::LcfiplusProcessor() : Processor("LcfiplusProcessor") {
 
   _inInit = false;
@@ -139,26 +136,13 @@ void LcfiplusProcessor::init() {
       _param->add(keys[i].c_str(), vals);
     }
 
-    // initialize LCIOStorer
-    if (!_lcio) {
-      _lcio = new LCIOStorer(0,0,true,false,0); // no file
-      _lcio->setReadSubdetectorEnergies(_readSubdetectorEnergies);
-      _lcio->setTrackHitOrdering(_trackHitOrdering);
-      _lcio->setUpdateVertexRPDaughters(_updateVertexRPDaughters);
-      _lcio->setIgnoreLackOfVertexRP(_ignoreLackOfVertexRP);
-      _lcio->setParticleIDAlgorithmName(_pidAlgoName.c_str());
-
-      _lcioowner = true;
-    } else {
-      _lcioowner = false;
-
-      if ((_lcio->getReadSubdetectorEnergies() != _readSubdetectorEnergies)
-          ||(_lcio->getTrackHitOrdering() != _trackHitOrdering)
-          ||(_lcio->getUpdateVertexRPDaughters() != _updateVertexRPDaughters)
-          ||(_lcio->getIgnoreLackOfVertexRP() != _ignoreLackOfVertexRP)) {
-        throw (lcfiplus::Exception("Global parameters do not match to previous processors: specify the same for all LcfiplusProcessors."));
-      }
-    }
+    // init LCIOStorer
+    _lcio = new LCIOStorer(0,0,true,false,0); // no file
+    _lcio->setReadSubdetectorEnergies(_readSubdetectorEnergies);
+    _lcio->setTrackHitOrdering(_trackHitOrdering);
+    _lcio->setUpdateVertexRPDaughters(_updateVertexRPDaughters);
+    _lcio->setIgnoreLackOfVertexRP(_ignoreLackOfVertexRP);
+    _lcio->setParticleIDAlgorithmName(_pidAlgoName.c_str());
 
     // load basic collection
     if (_useMcp)
@@ -226,9 +210,9 @@ void LcfiplusProcessor::processEvent( LCEvent* evt ) {
     		if(_autoJet)
     			_lcio->InitJetCollectionsAuto(evt);
     */
+
     // set LCEvent
-    if (_lcioowner)
-      _lcio->SetEvent(evt);
+    _lcio->SetEvent(evt);
 
     // set deafult mcp/track/netural
     Event::Instance()->setDefaultTracks(_pfoCollectionName.c_str());