]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Warnings corrected.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 4 Mar 2008 17:03:13 +0000 (17:03 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 4 Mar 2008 17:03:13 +0000 (17:03 +0000)
ANALYSIS/AliAnalysisFilter.cxx
ANALYSIS/AliAnalysisFilter.h
ANALYSIS/AliAnalysisManager.cxx
ANALYSIS/AliAnalysisTaskSE.cxx
ANALYSIS/AliAnalysisTaskSE.h
ANALYSIS/AliXMLCollection.cxx
ANALYSIS/AliXMLCollection.h

index def092c4cfa3cb9b6635247c7400069fb90fbc1c..59a3359daf12c77a7486dd83a5de8dda9bae1745 100644 (file)
@@ -48,12 +48,22 @@ AliAnalysisFilter::AliAnalysisFilter(const char* name, const char* title):
 }
 
 AliAnalysisFilter::AliAnalysisFilter(const AliAnalysisFilter& obj):
-    TNamed(obj)
+    TNamed(obj),
+    fCuts(0)
 {
 // Copy constructor
+    fCuts = obj.fCuts;
 }
 
 
+AliAnalysisFilter& AliAnalysisFilter::operator=(const AliAnalysisFilter& other)
+{
+// Assignment
+    TNamed::operator=(other);
+    fCuts = other.fCuts;
+    return *this;
+   }
+   
 UInt_t AliAnalysisFilter::IsSelected(TObject* obj)
 {
     //
index 4e8a02d6e579d2da40e1ef9324d5c187990f7d78..2dc1a4cbd9b5feb84667f35d7ccf2999c498845c 100644 (file)
@@ -20,7 +20,8 @@ class AliAnalysisFilter : public TNamed
  public:
     AliAnalysisFilter();
     AliAnalysisFilter(const char* name, const char* title = "AnalysisFilter");
-    AliAnalysisFilter(const AliAnalysisFilter& obj);  
+    AliAnalysisFilter(const AliAnalysisFilter& obj);
+    AliAnalysisFilter& operator=(const AliAnalysisFilter& other);
     virtual ~AliAnalysisFilter() {;}
     virtual UInt_t IsSelected(TObject* obj);
     virtual void AddCuts(AliAnalysisCuts* cuts);
index d0ff02963dbe697f819ba6745de981c118bc6bcb..a9e38ce9136a2f3418fc70fef03d43a1a3056296 100644 (file)
@@ -58,6 +58,7 @@ AliAnalysisManager::AliAnalysisManager(const char *name, const char *title)
                     fMode(kLocalAnalysis),
                     fInitOK(kFALSE),
                     fDebug(0),
+                    fSpecialOutputLocation(""), 
                     fTasks(NULL),
                     fTopTasks(NULL),
                     fZombies(NULL),
@@ -88,6 +89,7 @@ AliAnalysisManager::AliAnalysisManager(const AliAnalysisManager& other)
                     fMode(other.fMode),
                     fInitOK(other.fInitOK),
                     fDebug(other.fDebug),
+                    fSpecialOutputLocation(""), 
                     fTasks(NULL),
                     fTopTasks(NULL),
                     fZombies(NULL),
index 47ba5fc5d7efcae6f0ebb5d74aadfdf40a6b7b0c..aaf26e6a96f4b17225f2c6cfc93444ad69f3e0cc 100644 (file)
@@ -63,6 +63,34 @@ AliAnalysisTaskSE::AliAnalysisTaskSE(const char* name):
     DefineOutput(0,  TTree::Class());
 }
 
+AliAnalysisTaskSE::AliAnalysisTaskSE(const AliAnalysisTaskSE& obj):
+    AliAnalysisTask(obj),
+    fDebug(0),
+    fInputEvent(0x0),
+    fOutputAOD(0x0),
+    fMCEvent(0x0),
+    fTreeA(0x0)
+{
+// Copy constructor
+    fDebug      = obj.fDebug;
+    fInputEvent = obj.fInputEvent;
+    fOutputAOD  = obj.fOutputAOD;
+    fMCEvent    = obj.fMCEvent;
+    fTreeA      = obj.fTreeA;    
+}
+
+
+AliAnalysisTaskSE& AliAnalysisTaskSE::operator=(const AliAnalysisTaskSE& other)
+{
+// Assignment
+    AliAnalysisTask::operator=(other);
+    fDebug      = other.fDebug;
+    fInputEvent = other.fInputEvent;
+    fOutputAOD  = other.fOutputAOD;
+    fMCEvent    = other.fMCEvent;
+    fTreeA      = other.fTreeA;    
+    return *this;
+}
 
 
 void AliAnalysisTaskSE::ConnectInputData(Option_t* /*option*/)
index a2681091e303d2b24e8948804750986da349ae08..c47bf62f3b4e8314b5d0aa7d134f0821c1a056f3 100644 (file)
@@ -19,6 +19,8 @@ class AliAnalysisTaskSE : public AliAnalysisTask
  public:
     AliAnalysisTaskSE();
     AliAnalysisTaskSE(const char* name);
+    AliAnalysisTaskSE(const AliAnalysisTaskSE& obj);
+    AliAnalysisTaskSE& operator=(const AliAnalysisTaskSE& other);
     virtual ~AliAnalysisTaskSE() {;}
     // Implementation of interface methods
     virtual void ConnectInputData(Option_t *option = "");
@@ -28,7 +30,7 @@ class AliAnalysisTaskSE : public AliAnalysisTask
     virtual void Init() {;}
     // To be implemented by user
     virtual void UserCreateOutputObjects()  {;}
-    virtual void UserExec(Option_t* option) {;}
+    virtual void UserExec(Option_t* /*option*/) {;}
     
     // Getters
     virtual AliVEvent*   InputEvent()  {return fInputEvent;}
index c5dc271bb3df0a7a0b7c66edd1eddab1d464856f..e1246d887613fe7a5d6fd9aa3ce52e740771d1d2 100644 (file)
@@ -34,7 +34,6 @@
 #include "AliXMLCollection.h"
 
 ClassImp(AliXMLCollection)
-
 //___________________________________________________________________________
   AliXMLCollection::AliXMLCollection() :
     TGridCollection(),
@@ -48,15 +47,22 @@ ClassImp(AliXMLCollection)
 }
 
 //___________________________________________________________________________
-AliXMLCollection::AliXMLCollection(const char *localcollectionfile) {
+AliXMLCollection::AliXMLCollection(const char *localcollectionfile) :
+    TGridCollection(),
+    fXmlFile(localcollectionfile),
+    fEventList(0),
+    fEventListIter(0),
+    fCurrent(0),
+    fCollectionName(),
+    fout()
+ {
    // Create Alien event collection, by reading collection for the specified
    // file.
 
-   fXmlFile = localcollectionfile;
    fEventList = new TList();
    fEventList->SetOwner(kTRUE);
    fEventListIter = new TIter(fEventList);
-   fCurrent = 0;
+
    if (localcollectionfile!=0) {
      ParseXML();
    }
@@ -66,7 +72,12 @@ AliXMLCollection::AliXMLCollection(const char *localcollectionfile) {
 AliXMLCollection::AliXMLCollection(const AliXMLCollection& collection):
   TGridCollection(collection),
   fXmlFile(collection.fXmlFile),
-  fCollectionName(collection.fCollectionName) {
+  fEventList(0),
+  fEventListIter(0),
+  fCurrent(0),
+  fCollectionName(collection.fCollectionName),
+  fout()
+{
   //copy constructor
 
   if (collection.fEventList) fEventList = new TList();
@@ -167,7 +178,7 @@ TMap *AliXMLCollection::Next() {
 }
 
 //___________________________________________________________________________
-const char *AliXMLCollection::GetTURL(const char* filename) const {
+const char *AliXMLCollection::GetTURL(const char* filename) {
   // Get a file's transport URL (TURL). Returns 0 in case of error.
   
   if (fCurrent) {
@@ -183,7 +194,7 @@ const char *AliXMLCollection::GetTURL(const char* filename) const {
 }
 
 //___________________________________________________________________________
-const char *AliXMLCollection::GetGUID(const char* filename) const {
+const char *AliXMLCollection::GetGUID(const char* filename) {
   // Get a file's transport UID. Returns 0 in case of error.
   
   if (fCurrent) {
@@ -225,7 +236,7 @@ Bool_t AliXMLCollection::Remove(TMap * map) {
 }
 
 //___________________________________________________________________________
-const char *AliXMLCollection::GetLFN(const char* ) const {
+const char *AliXMLCollection::GetLFN(const char* ) {
   // Get a file's LFN. Returns 0 in case of error.
   
   if (fCurrent) {
@@ -241,7 +252,7 @@ const char *AliXMLCollection::GetLFN(const char* ) const {
 }
 
 //__________________________________________________________________________
-Bool_t AliXMLCollection::OverlapCollection(AliXMLCollection * comparator) {
+Bool_t AliXMLCollection::OverlapCollection(TGridCollection * comparator) {
   // return kTRUE if comparator overlaps with this
   if ((!comparator)) return kFALSE;
   
index d19a7d27829b294c9fd7aa0b43db6b57d3df29e3..8e1c303ef57cdcf68bd065ad856c2c8743cf23f1 100644 (file)
@@ -40,17 +40,17 @@ class AliXMLCollection : public TGridCollection {
   void SetCollectionName(const char* name) {fCollectionName = name;}
   
   //____________________________________________________//
-  const char* GetCollectionName() {return fCollectionName.Data();}
+  const char* GetCollectionName() const {return fCollectionName.Data();}
 
   //____________________________________________________//
   void        Reset();
   TMap       *Next();
   Bool_t      Remove(TMap *map);
-  const char *GetTURL(const char *name) const;
-  const char *GetLFN(const char *name) const;
-  const char *GetGUID(const char *name) const;
+  const char *GetTURL(const char *name);
+  const char *GetLFN(const char *name);
+  const char *GetGUID(const char *name);
   TEntryList *GetEventList(const char *filename) const;
-  Bool_t      OverlapCollection(AliXMLCollection * comparator);
+  Bool_t      OverlapCollection(TGridCollection * comparator);
 
   static AliXMLCollection *Open(const char *localcollectionfile);