CaloD3PDMaker: More CA configuration fixes.

Some missing dependencies.

PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py

@@ -66,6 +66,19 @@ def hookForCaloNoiseCondAlg(c, flags, acc, prefix, *args, **kw):
     acc.merge (CaloNoiseCondAlgCfg (flags, noisetype='totalNoise'))
     return
 
+
+def hookForCaloBadChanTool(c, flags, acc, *args, **kw):
+    from CaloBadChannelTool.CaloBadChanToolConfig import CaloBadChanToolCfg
+    c.BadChannelTool = acc.popToolsAndMerge (CaloBadChanToolCfg (flags))
+    return
+
+
+def hookForCaloGM(c, flags, acc, prefix, *args, **kw):
+    from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+    acc.merge (LArGMCfg (flags))
+    return
+
+
 def makeCaloCellD3PDObject (maker, prefix, object_name) :
 
     cellD3PDObject = D3PDObject (makeCellD3PDObject, prefix, object_name)
@@ -74,6 +87,8 @@ def makeCaloCellD3PDObject (maker, prefix, object_name) :
         #print " in makeCaloCellD3PDMaker, prefix ="  , prefix 
         cellD3PDObject.defineHook  ( hookForCaloCellFilterAlg )
 
+    cellD3PDObject.defineHook  ( hookForCaloGM )
+
     cellD3PDObject.defineBlock (0, 'Kinematics',
                                 D3PD.FourMomFillerTool,
                                 WriteE  = True,  WriteM = False)
@@ -91,20 +106,22 @@ def makeCaloCellD3PDObject (maker, prefix, object_name) :
                                 )
 
 
-    cellD3PDObject.defineBlock (2, 'Detail2',
-                                D3PD.CaloCellDetailsFillerTool,
-                                SaveCellQuality=False,
-                                SaveTimeInfo=False,
-                                SaveDetInfo=False,
-                                SaveCellGain=False,
-                                SaveBadCellStatus=True,
-                                SaveId =True,
-                                SavePositionInfo=True,
-                                )
+    detail2 = cellD3PDObject.defineBlock (2, 'Detail2',
+                                          D3PD.CaloCellDetailsFillerTool,
+                                          SaveCellQuality=False,
+                                          SaveTimeInfo=False,
+                                          SaveDetInfo=False,
+                                          SaveCellGain=False,
+                                          SaveBadCellStatus=True,
+                                          SaveId =True,
+                                          SavePositionInfo=True,
+                                          )
+    detail2.defineHook  ( hookForCaloBadChanTool )
 
     cellD3PDObject.defineHook  ( hookForCaloNoiseCondAlg )
     noiseType = "totalNoise"
 
+    
     cellD3PDObject.defineBlock (3, 'Detail3',
                                 D3PD.CaloCellDetailsFillerTool,
                                 SaveCellQuality=False,