modified: .gitignore
Compare changes
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
@@ -12,9 +12,14 @@ detector_path = ""
@@ -31,6 +36,7 @@ from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi
@@ -38,6 +44,7 @@ from Configurables import Jug__Reco__TrackParamTruthInit as TrackParamTruthInit
@@ -49,6 +56,7 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
@@ -57,65 +65,119 @@ trkcopier = TrkCopier("TrkCopier",
@@ -125,16 +187,11 @@ sourcelinker = TrackerSourceLinker("sourcelinker",
@@ -143,44 +200,41 @@ clust_trk_init = TrackParamClusterInit("clust_trk_init",
@@ -210,21 +264,10 @@ out.outputCommands = ["keep *",