Clean up jobOpts, add old ChangeLog as commit message

old ChangeLog: 2017-02-21 Vakho Tsulaia <tsulaia@cern.ch> * Upgrading share/CaloHiveExOpts.py to a new input file (the one used by share/CaloHiveExOpts_SerialOnly.py) * Dropping share/CaloHiveExOpts_SerialAndMT.py * Tagging CaloHiveEx-02-05-11 2017-02-18 Vakho Tsulaia <tsulaia@cern.ch> * Replacing CaloHiveExOpts_r22 with two CaloHiveExOpts_Serial* scripts * Taggng CaloHiveEx-02-05-10 2017-02-17 Walter Lampl <walter.lampl@ cern.ch> * Turn deadOTx corr off in CaloHiveExOpts_r22 * tag CaloHiveEx-02-05-09 2017-02-16 Vakho Tsulaia <tsulaia@cern.ch> * Adding CaloHiveExOpts_r22.py to have an example script that runs in devval. Fore the time being the script can run only in serial Athena 2017-01-25 scott snyder <snyder@bnl.gov> * Tagging CaloHiveEx-02-05-07. * share/CaloHiveExOpts.py: Remove override of CaloCellMaker OwnPolicy. Not needed now that we have switched back to using DataPool. 2016-12-21 Vakho Tsulaia <tsulaia@cern.ch> * Fixing share/CaloHiveExOpts.py such that it can work with and without --threads=N * Tagging CaloHiveEx-02-05-06 2016-08-25 Charles Leggett * added CMakeLists.txt * tag CaloHiveEx-02-05-05 A CMakeLists.txt 2016-06-16 Jovan Mitrevski * Add a first attempt at a JO file that uses RecExCommon in order * to work with data inputs. (Does not yet work with data inputs.) * tag CaloHiveEx-02-05-04 A share/CaloHiveExOpts_alt.py 2016-04-11 Jovan Mitrevski * Make CaloHiveExOpts.py call SetGeometryVersion * tag CaloHiveEx-02-05-03 M share/CaloHiveExOpts.py 2016-04-08 Jovan Mitrevski * Make CaloHiveExOpts.py set GeoModelSvc.SupportedGeometry * tag CaloHiveEx-02-05-02 M share/CaloHiveExOpts.py 2015-10-06 Charles Leggett * use ClassNames instead of CLID in jobOpts * simplify requirements * tag CaloHiveEx-02-05-01 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py M cmt/requirements D src/components/CaloHiveEx_entries.cxx D src/components/CaloHiveEx_load.cxx 2015-10-01 Charles Leggett * remove SGInputLoader - generic equivalent now in SGComps-00-02-02 * tag CaloHiveEx-02-05-00 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py D src/SGInputLoader.cxx M src/components/CaloHiveEx_entries.cxx D src/SGInputLoader.h 2015-10-01 Charles Leggett * update jobOpts for new data dep declaration syntax * do data dep checking * tag CaloHiveEx-02-04-01 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py 2015-09-17 Charles Leggett * new jobOpts for explicit declaration of data dependencies by each algorithm. old version saved as CaloHiveExOpt.old.py * tag CaloHiveEx-02-04-00 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py A share/old A share/old/CaloHiveExOpts.py A share/old/CaloHiveDeps.py 2015-08-13 Jovan Mitrevski * add an ATN test to run CaloHiveEx * tag CaloHiveEx-02-03-05 A test A test/CaloHiveEx_TestConfiguration.xml 2015-07-01 Charles Leggett * get rid of AthenaMPFlags.PreCountedEvents stuff * tag CaloHiveEx-02-03-04 M share/CaloHiveExOpts.py 2015-06-24 Charles Leggett * print error message if --threads option not used * tag CaloHiveEx-02-03-03 M share/CaloHiveExOpts.py 2015-06-24 Rolf Seuster * adding jets * tag CaloHiveEx-02-03-02 2015-06-09 Charles Leggett * enable mp/hive in jobOpts * tag CaloHiveEx-02-03-01 M share/CaloHiveExOpts.py 2015-05-01 Charles Leggett * update for --threads=N command line opt * tag CaloHiveEx-02-03-00 2015-05-04 Charles Leggett * property ShowEventDump * rename jobOpt to CaloHiveExOpts.py * rename data deps to CaloHiveDeps.py * fix tokens for MessageSvc * tag CaloHiveEx-02-02-00 A share/CaloHiveExOpts.py D share/CaloBUAlgoDep_noTrig.py D share/CaloBottomUp_hive.py A share/CaloHiveDeps.py M src/SGInputLoader.cxx M src/SGInputLoader.h 2015-03-16 Charles Leggett * fix typo * tag CaloHiveEx-02-01-05 M share/CaloBottomUp_hive.py 2015-03-12 Charles Leggett * improved data dep registration * tag CaloHiveEx-02-01-04 M share/CaloBUAlgoDep_noTrig.py M share/CaloBottomUp_hive.py 2015-02-05 Charles Leggett * added xAODMaker::TriggerTowerCnvAlg * tag CaloHiveEx-02-01-03 M share/CaloBUAlgoDep_noTrig.py M share/CaloBottomUp_hive.py 2015-02-05 Charles Leggett * much better checking of consistency of Alg Dependencies * tag CaloHiveEx-02-01-02 M share/CaloBUAlgoDep_noTrig.py M share/CaloBottomUp_hive.py 2015-02-04 Charles Leggett * don't remove LArRawChannelBuilder from topSequence - not there anymoe should really test to see if it's there.... * tag CaloHiveEx-02-01-01 M share/CaloBottomUp_hive.py 2015-02-04 Charles Leggett * updates for SGCommitAuditor * Calo cell ownership policy * tag CaloHiveEx-02-01-00 M share/CaloBottomUp_hive.py 2014-05-20 Charles Leggett * update for gaudi v25 * tag CaloHiveEx-02-00-00 M share/CaloBottomUp_hive.py 2013-12-05 Charles Leggett * initial import * tag CaloHiveEx-01-00-00

Clean up jobOpts, add old ChangeLog as commit message
old ChangeLog: 2017-02-21 Vakho Tsulaia <tsulaia@cern.ch> * Upgrading share/CaloHiveExOpts.py to a new input file (the one used by share/CaloHiveExOpts_SerialOnly.py) * Dropping share/CaloHiveExOpts_SerialAndMT.py * Tagging CaloHiveEx-02-05-11 2017-02-18 Vakho Tsulaia <tsulaia@cern.ch> * Replacing CaloHiveExOpts_r22 with two CaloHiveExOpts_Serial* scripts * Taggng CaloHiveEx-02-05-10 2017-02-17 Walter Lampl <walter.lampl@ cern.ch> * Turn deadOTx corr off in CaloHiveExOpts_r22 * tag CaloHiveEx-02-05-09 2017-02-16 Vakho Tsulaia <tsulaia@cern.ch> * Adding CaloHiveExOpts_r22.py to have an example script that runs in devval. Fore the time being the script can run only in serial Athena 2017-01-25 scott snyder <snyder@bnl.gov> * Tagging CaloHiveEx-02-05-07. * share/CaloHiveExOpts.py: Remove override of CaloCellMaker OwnPolicy. Not needed now that we have switched back to using DataPool. 2016-12-21 Vakho Tsulaia <tsulaia@cern.ch> * Fixing share/CaloHiveExOpts.py such that it can work with and without --threads=N * Tagging CaloHiveEx-02-05-06 2016-08-25 Charles Leggett * added CMakeLists.txt * tag CaloHiveEx-02-05-05 A CMakeLists.txt 2016-06-16 Jovan Mitrevski * Add a first attempt at a JO file that uses RecExCommon in order * to work with data inputs. (Does not yet work with data inputs.) * tag CaloHiveEx-02-05-04 A share/CaloHiveExOpts_alt.py 2016-04-11 Jovan Mitrevski * Make CaloHiveExOpts.py call SetGeometryVersion * tag CaloHiveEx-02-05-03 M share/CaloHiveExOpts.py 2016-04-08 Jovan Mitrevski * Make CaloHiveExOpts.py set GeoModelSvc.SupportedGeometry * tag CaloHiveEx-02-05-02 M share/CaloHiveExOpts.py 2015-10-06 Charles Leggett * use ClassNames instead of CLID in jobOpts * simplify requirements * tag CaloHiveEx-02-05-01 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py M cmt/requirements D src/components/CaloHiveEx_entries.cxx D src/components/CaloHiveEx_load.cxx 2015-10-01 Charles Leggett * remove SGInputLoader - generic equivalent now in SGComps-00-02-02 * tag CaloHiveEx-02-05-00 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py D src/SGInputLoader.cxx M src/components/CaloHiveEx_entries.cxx D src/SGInputLoader.h 2015-10-01 Charles Leggett * update jobOpts for new data dep declaration syntax * do data dep checking * tag CaloHiveEx-02-04-01 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py 2015-09-17 Charles Leggett * new jobOpts for explicit declaration of data dependencies by each algorithm. old version saved as CaloHiveExOpt.old.py * tag CaloHiveEx-02-04-00 M share/CaloHiveExOpts.py M share/CaloHiveDeps.py A share/old A share/old/CaloHiveExOpts.py A share/old/CaloHiveDeps.py 2015-08-13 Jovan Mitrevski * add an ATN test to run CaloHiveEx * tag CaloHiveEx-02-03-05 A test A test/CaloHiveEx_TestConfiguration.xml 2015-07-01 Charles Leggett * get rid of AthenaMPFlags.PreCountedEvents stuff * tag CaloHiveEx-02-03-04 M share/CaloHiveExOpts.py 2015-06-24 Charles Leggett * print error message if --threads option not used * tag CaloHiveEx-02-03-03 M share/CaloHiveExOpts.py 2015-06-24 Rolf Seuster * adding jets * tag CaloHiveEx-02-03-02 2015-06-09 Charles Leggett * enable mp/hive in jobOpts * tag CaloHiveEx-02-03-01 M share/CaloHiveExOpts.py 2015-05-01 Charles Leggett * update for --threads=N command line opt * tag CaloHiveEx-02-03-00 2015-05-04 Charles Leggett * property ShowEventDump * rename jobOpt to CaloHiveExOpts.py * rename data deps to CaloHiveDeps.py * fix tokens for MessageSvc * tag CaloHiveEx-02-02-00 A share/CaloHiveExOpts.py D share/CaloBUAlgoDep_noTrig.py D share/CaloBottomUp_hive.py A share/CaloHiveDeps.py M src/SGInputLoader.cxx M src/SGInputLoader.h 2015-03-16 Charles Leggett * fix typo * tag CaloHiveEx-02-01-05 M share/CaloBottomUp_hive.py 2015-03-12 Charles Leggett * improved data dep registration * tag CaloHiveEx-02-01-04 M share/CaloBUAlgoDep_noTrig.py M share/CaloBottomUp_hive.py 2015-02-05 Charles Leggett * added xAODMaker::TriggerTowerCnvAlg * tag CaloHiveEx-02-01-03 M share/CaloBUAlgoDep_noTrig.py M share/CaloBottomUp_hive.py 2015-02-05 Charles Leggett * much better checking of consistency of Alg Dependencies * tag CaloHiveEx-02-01-02 M share/CaloBUAlgoDep_noTrig.py M share/CaloBottomUp_hive.py 2015-02-04 Charles Leggett * don't remove LArRawChannelBuilder from topSequence - not there anymoe should really test to see if it's there.... * tag CaloHiveEx-02-01-01 M share/CaloBottomUp_hive.py 2015-02-04 Charles Leggett * updates for SGCommitAuditor * Calo cell ownership policy * tag CaloHiveEx-02-01-00 M share/CaloBottomUp_hive.py 2014-05-20 Charles Leggett * update for gaudi v25 * tag CaloHiveEx-02-00-00 M share/CaloBottomUp_hive.py 2013-12-05 Charles Leggett * initial import * tag CaloHiveEx-01-00-00
c0e30d9f · Charles Leggett · 2ccc3faf · c0e30d9f · c0e30d9f
Commit c0e30d9f authored 8 years ago by Charles Leggett
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveDeps.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveDeps.py
@@ -8,18 +8,10 @@ xAODMaker__EventInfoCnvAlg.ExtraInputs =  [('EventInfo','McEventInfo')]
 xAODMaker__EventInfoCnvAlg.ExtraOutputs = [('xAOD::EventAuxInfo','EventInfoAux.'),
                                           ('xAOD::EventInfo','EventInfo') ]

-                                           
-#xAODMaker__TriggerTowerCnvAlg.ExtraInputs =  [('EventInfo','McEventInfo'),
-#                                              ('DataVector<LVL1::TriggerTower>','TriggerTowers')]
-#xAODMaker__TriggerTowerCnvAlg.ExtraOutputs = [('xAOD::TriggerTowerAuxContainer','xAODTriggerTowersAux.'),
-#                                              ('xAOD::TriggerTowerContainer','xAODTriggerTowers')]
-

 topSequence.CaloCellMaker.ExtraInputs =   [('EventInfo','McEventInfo'),
                                           ('LArRawChannelContainer','LArRawChannels'),
                                           ('TileRawChannelContainer','TileRawChannelCnt')]
-#                                           ('DataVector<LVL1::TriggerTower>','TriggerTowers'),
-#                                           ('xAOD::TriggerTowerContainer','xAODTriggerTowers')]
 topSequence.CaloCellMaker.ExtraOutputs =  [('CaloCellContainer','AllCalo'),
                                           ('TileCellContainer','MBTSContainer')]


--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
@@ -158,7 +158,6 @@ print "=========================================================================
 # names of algs are:
 #  SGInputLoader
 #  xAODMaker::EventInfoCnvAlg
-#  xAODMaker::TriggerTowerCnvAlg
 #  EventCounter
 #  CaloCellMaker
 #  CmbTowerBldr