Initialisation revisited

diff --git a/VZERO/AliVZEROTriggerSimulator.cxx b/VZERO/AliVZEROTriggerSimulator.cxx
index 0885d1c3b1a176bde8a2112ea1a047b235e8098f..bb90290e6c402229b88dfeb5d982dc1e6b3c4acd 100644 (file)
--- a/VZERO/AliVZEROTriggerSimulator.cxx
+++ b/VZERO/AliVZEROTriggerSimulator.cxx
@@ -32,20 +32,12 @@
 \r
 ClassImp(AliVZEROTriggerSimulator)\r
 \r
-//________________________________________________________________\r
-AliVZEROTriggerSimulator::AliVZEROTriggerSimulator(const AliVZEROTriggerSimulator& triggersim) : \r
-TObject(),fTriggerData(LoadTriggerData()),fDigitsTree(NULL),fDigits(NULL),fTriggerWord(0)\r
-\r
-{\r
-       // copy constructor\r
-       \r
-       AliInfo("Not implemented");\r
-}\r
-\r
 //_____________________________________________________________________________\r
 AliVZEROTriggerSimulator::AliVZEROTriggerSimulator(TTree * digitsTree, TClonesArray* digits) : \r
-TObject(),fTriggerData(LoadTriggerData()),fDigitsTree(digitsTree),fDigits(digits),fTriggerWord(0)\r
+TObject(),fTriggerData(NULL),fDigitsTree(digitsTree),fDigits(digits),fTriggerWord(0)\r
 {\r
+       fTriggerData = LoadTriggerData();\r
+       \r
        for(int i=0;i<64;i++) {\r
                fBBFlags[i] = fBGFlags[i] = kFALSE;\r
                fCharges[i] = 0;\r
@@ -61,8 +53,10 @@ TObject(),fTriggerData(LoadTriggerData()),fDigitsTree(digitsTree),fDigits(digits
 }\r
 //_____________________________________________________________________________\r
 AliVZEROTriggerSimulator::AliVZEROTriggerSimulator() : \r
-TObject(),fTriggerData(LoadTriggerData()),fDigitsTree(NULL),fDigits(NULL),fTriggerWord(0)\r
+TObject(),fTriggerData(NULL),fDigitsTree(NULL),fDigits(NULL),fTriggerWord(0)\r
 {\r
+       fTriggerData = LoadTriggerData();\r
+\r
        for(int i=0;i<64;i++) {\r
                fBBFlags[i] = fBGFlags[i] = kFALSE;\r
                fCharges[i] = 0;\r
@@ -254,3 +248,4 @@ void AliVZEROTriggerSimulator::Run() {
        \r
 }\r
 \r
+\r

diff --git a/VZERO/AliVZEROTriggerSimulator.h b/VZERO/AliVZEROTriggerSimulator.h
index 25bf034bfaabca4458d6f056b72d6dd78938b58b..c47488854a465957860df1677490fb5efe5812ee 100644 (file)
--- a/VZERO/AliVZEROTriggerSimulator.h
+++ b/VZERO/AliVZEROTriggerSimulator.h
@@ -19,8 +19,6 @@ public:
        AliVZEROTriggerSimulator();\r
        AliVZEROTriggerSimulator(TTree * digitsTree, TClonesArray* digits);\r
        ~AliVZEROTriggerSimulator();\r
-       AliVZEROTriggerSimulator(const AliVZEROTriggerSimulator &triggerSim);\r
-       AliVZEROTriggerSimulator& operator= (const AliVZEROTriggerSimulator & /*triggerSim*/){AliInfo("Not implemented");return *this;};\r
        \r
        AliVZEROTriggerData * GetTriggerData() const {return fTriggerData;};\r
        \r
@@ -62,6 +60,8 @@ public:
        \r
 private:\r
        // Private methods\r
+       AliVZEROTriggerSimulator(const AliVZEROTriggerSimulator &/*triggerSim*/);\r
+       AliVZEROTriggerSimulator& operator= (const AliVZEROTriggerSimulator & /*triggerSim*/);\r
        AliVZEROTriggerData * LoadTriggerData() const ;\r
        void GenerateBBWindows();\r
        void GenerateBGWindows();\r
@@ -92,3 +92,4 @@ private:
 \r
 \r
 #endif // ALIVZEROTRIGGERSIMULATOR_H\r
+\r