Merge branch 'calo.D3PDMakerTest-20181210' into 'master'

D3PDMakerTest: Adjust references to moved components.

See merge request atlas/athena!16619

Former-commit-id: bc637586

PhysicsAnalysis/D3PDMaker/D3PDMakerTest/share/D3PDTestPhysicsESD_jo.py

@@ -34,7 +34,7 @@ alg = TrackD3PD (tupleFileOutput,
                  PrimaryVertex_storeDiagonalCovarianceAsErrors = True)
 
 # And a calorimeter tree!
-from CaloD3PDMaker.CaloD3PD import CaloD3PD
+from CaloSysD3PDMaker.CaloD3PD import CaloD3PD
 alg = CaloD3PD (file = tupleFileOutput)
 
 # Make supercells into a separate file, if available.