removing global component instances formerly used for registration; registration...

diff --git a/HLT/PHOS/AliHLTPHOSAgent.cxx b/HLT/PHOS/AliHLTPHOSAgent.cxx
index 8343be18b8bbe5e59402f34c2a6c7c74c285e20b..414ec16cf168883b8cdf0b700ced06bf8e99ae50 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSAgent.cxx
+++ b/HLT/PHOS/AliHLTPHOSAgent.cxx
@@ -1,4 +1,4 @@
-
+// $Id$
 //**************************************************************************
 //* This file is property of and copyright by the ALICE HLT Project        * 
 //* ALICE Experiment at CERN, All rights reserved.                         *
@@ -43,6 +43,7 @@ AliHLTPHOSAgent gAliHLTPHOSAgent;
 #include "AliHLTPHOSCalibrationComponent.h"
 #include "AliHLTPHOSClusterAnalyserComponent.h"
 #include "AliHLTPHOSClusterizerComponent.h"
+#include "AliHLTPHOSClusterizerComponentNbyN.h"
 #include "AliHLTPHOSDigitMakerComponent.h"
 #include "AliHLTPHOSESDEntriesMakerComponent.h"
 #include "AliHLTPHOSHistogramProducerComponent.h"
@@ -190,6 +191,7 @@ int AliHLTPHOSAgent::RegisterComponents(AliHLTComponentHandler* pHandler) const
   pHandler->AddComponent(new AliHLTPHOSRawAnalyzerCrudeComponentv2);
   pHandler->AddComponent(new AliHLTPHOSDigitMakerComponent);
   pHandler->AddComponent(new AliHLTPHOSClusterizerComponent);
+  pHandler->AddComponent(new AliHLTPHOSClusterizerComponentNbyN);
   pHandler->AddComponent(new AliHLTPHOSClusterAnalyserComponent);                       
   pHandler->AddComponent(new AliHLTPHOSESDEntriesMakerComponent);
 

diff --git a/HLT/PHOS/AliHLTPHOSAgent.h b/HLT/PHOS/AliHLTPHOSAgent.h
index 6186c7e69d8de59c612c5cdfdb81d180a0f19fb0..a796c080602d6a4dcc6b538a154f96d63e9e6c64 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSAgent.h
+++ b/HLT/PHOS/AliHLTPHOSAgent.h
@@ -1,4 +1,5 @@
-
+//-*- Mode: C++ -*-
+// $Id$
 #ifndef ALIHLTPHOSAGENT_H
 #define ALIHLTPHOSAGENT_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *

diff --git a/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx b/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
index d4254652f837ba588e29027646369cc79a8cd4eb..db6c9a1cf783e2a9cd4721fcb615b50977a4f79c 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
@@ -41,8 +41,6 @@
 #include "AliHLTPHOSRecoParamHandler.h"
 #include "AliHLTCaloClusterizer.h"
 
-AliHLTPHOSClusterizerComponent gAliHLTPHOSClusterizerComponent;
-
 AliHLTPHOSClusterizerComponent::AliHLTPHOSClusterizerComponent(): 
   AliHLTCaloClusterizerComponent("PHOS")
 {

diff --git a/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.cxx b/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.cxx
index 180f53f8b61a51d11f66f848166391e3a4ee1393..d09b5cfdfd791a552b0943bc245998f091ae6306 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.cxx
@@ -1,4 +1,4 @@
-
+// $Id$
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
@@ -19,8 +19,6 @@
 
 ClassImp(AliHLTPHOSClusterizerComponentNbyN);
 
-AliHLTPHOSClusterizerComponentNbyN gAliHLTPHOSClusterizerComponentNbyN;
-
 AliHLTPHOSClusterizerComponentNbyN::AliHLTPHOSClusterizerComponentNbyN() : AliHLTPHOSClusterizerComponent()
 {
 // Constructor

diff --git a/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.h b/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.h
index 1c4a20a1ed708c8128e114fbd209152206a72805..c1fabd19cb7ff7937533b0ade51f2f22abe796c4 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.h
+++ b/HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.h
@@ -1,4 +1,5 @@
-
+//-*- Mode: C++ -*-
+// $Id$
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *

diff --git a/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx b/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx
index 3158f1b2ee25a2728e9534dbeb3961d5b0528371..997a499094317630a0a8e2d606ec90b85a6980fc 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx
@@ -46,8 +46,6 @@
 
 ClassImp(AliHLTPHOSDigitMakerComponent);
 
-AliHLTPHOSDigitMakerComponent gAliHLTPHOSDigitMakerComponent;
-
 AliHLTPHOSDigitMakerComponent::AliHLTPHOSDigitMakerComponent() :
   AliHLTCaloProcessor(),
   AliHLTCaloConstantsHandler("PHOS"),

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx
index 90047fc265de7d9c8aaa42d8c99250aea1a34960..7b3f2544b17275093011bd02687f50063855c498 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx
@@ -1,4 +1,4 @@
-
+// $Id$
 /**************************************************************************
  * This file is property of and copyright by the ALICE HLT Project        * 
  * All rights reserved.                                                   *

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.h b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.h
index 1e19ca2f62e79bfc0ca30a2e3aa8b88d0f707095..607b3410cc15818f2f3e5b1134533db871388dc7 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.h
@@ -1,4 +1,5 @@
-
+//-*- Mode: C++ -*-
+// $Id$
 /**************************************************************************
  * This file is property of and copyright by the ALICE HLT Project        * 
  * All rights reserved.                                                   *

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
index 28600c4baa136bd56e5a0239fc01da79c4ddbdf6..e678287881eb772402ccde81a93565483cdf60fd 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
@@ -19,8 +19,6 @@
 
 #include "AliHLTPHOSRawAnalyzerCrudeComponent.h"
 
-AliHLTPHOSRawAnalyzerCrudeComponent gAliHLTPHOSRawAnalyzerCrudeComponent;
-
 //___________________________________________________________________________
 AliHLTPHOSRawAnalyzerCrudeComponent::AliHLTPHOSRawAnalyzerCrudeComponent() : AliHLTPHOSRawAnalyzerComponentv3(kCrude)
 {