From 6e4e07f6effe5a10947e807341b6881a39882d91 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Fri, 24 Feb 2017 13:49:41 +0100 Subject: [PATCH] Revert " add readerParameters to input readers" This reverts commit 70feca4742a0721bdbe7197de1a33eb878a63799. --- DDSim/DD4hepSimulation.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/DDSim/DD4hepSimulation.py b/DDSim/DD4hepSimulation.py index 13289090f..e35a5881b 100644 --- a/DDSim/DD4hepSimulation.py +++ b/DDSim/DD4hepSimulation.py @@ -86,7 +86,6 @@ class DD4hepSimulation(object): self.filter = Filter() self.physics = Physics() - self.readerParameters = {} ### use TCSH geant UI instead of QT os.environ['G4UI_USE_TCSH'] = "1" @@ -348,32 +347,24 @@ class DD4hepSimulation(object): actionList.append(self._g4gps) for index,inputFile in enumerate(self.inputFiles, start=4): - print " ******** self.readerParameters = ", self.readerParameters if inputFile.endswith(".slcio"): gen = DDG4.GeneratorAction(kernel,"LCIOInputAction/LCIO%d" % index) gen.Input="LCIOFileReader|"+inputFile - gen.Parameters = self.readerParameters elif inputFile.endswith(".stdhep"): gen = DDG4.GeneratorAction(kernel,"LCIOInputAction/STDHEP%d" % index) gen.Input="LCIOStdHepReader|"+inputFile - gen.Parameters = self.readerParameters elif inputFile.endswith(".HEPEvt"): gen = DDG4.GeneratorAction(kernel,"Geant4InputAction/HEPEvt%d" % index) gen.Input="Geant4EventReaderHepEvtShort|"+inputFile - gen.Parameters = self.readerParameters elif inputFile.endswith(".hepevt"): gen = DDG4.GeneratorAction(kernel,"Geant4InputAction/hepevt%d" % index) gen.Input="Geant4EventReaderHepEvtLong|"+inputFile - gen.Parameters = self.readerParameters elif inputFile.endswith(".hepmc"): gen = DDG4.GeneratorAction(kernel,"Geant4InputAction/hepmc%d" % index) gen.Input="Geant4EventReaderHepMC|"+inputFile - gen.Parameters = self.readerParameters elif inputFile.endswith(".pairs"): gen = DDG4.GeneratorAction(kernel,"Geant4InputAction/HEPEvt%d" % index) gen.Input="Geant4EventReaderGuineaPig|"+inputFile - gen.Parameters = self.readerParameters - else: ##this should never happen because we already check at the top, but in case of some LogicError... raise RuntimeError( "Unknown input file type: %s" % inputFile ) -- GitLab