From Artur:

- Fix to get the interface to read LocalTrigger objects correctly.
- Fix for assigning the fMuonLoader variable correctly.
- Added two features:
  1) Only delete the fRunLoader object if it was created by
     AliMUONDataInterface.
  2) Added a method to explicitly fetch the current run loader and use it
     instead of creating a new one.

diff --git a/MUON/AliMUONDataInterface.cxx b/MUON/AliMUONDataInterface.cxx
index 0caf3de3e22adf6d60e37b282dc1d72db72ae7e2..4ca6f7df80404356b47ac869d966c9b54645274d 100644 (file)
--- a/MUON/AliMUONDataInterface.cxx
+++ b/MUON/AliMUONDataInterface.cxx
@@ -15,6 +15,10 @@
 #include "AliMUONRawCluster.h"
 #include "AliLog.h"
 
 #include "AliMUONRawCluster.h"
 #include "AliLog.h"
 

+#include <iostream>
+using std::endl;
+using std::cout;
+

 
 ClassImp(AliMUONDataInterface)
 
 
 ClassImp(AliMUONDataInterface)
 


@@ -37,11 +41,11 @@ AliMUONDataInterface::AliMUONDataInterface(const AliMUONDataInterface& rhs)
 
 AliMUONDataInterface::~AliMUONDataInterface()
 {
 
 AliMUONDataInterface::~AliMUONDataInterface()
 {

-// Delete the runloader when done.
+// Delete the runloader if we created it.

 // If the runloader is not to be deleted then call Reset just before 
 // the destructor is called.
 
 // If the runloader is not to be deleted then call Reset just before 
 // the destructor is called.
 

-       if (fRunloader != NULL)
+       if (fRunloader != NULL && fCreatedRunLoader)

                delete fRunloader;
 }
 
                delete fRunloader;
 }
 


@@ -64,6 +68,7 @@ void AliMUONDataInterface::Reset()
 // Note: No resources are released!
 // Specificaly AliRunLoader is not deleted.
 
 // Note: No resources are released!
 // Specificaly AliRunLoader is not deleted.
 

+       fCreatedRunLoader = kFALSE;

        fRunloader = NULL;
        fMuonloader = NULL;
        fEventnumber = -1;
        fRunloader = NULL;
        fMuonloader = NULL;
        fEventnumber = -1;


@@ -78,6 +83,46 @@ void AliMUONDataInterface::Reset()
 }
 
 
 }
 
 

+Bool_t AliMUONDataInterface::UseCurrentRunLoader()
+{
+// Tries to fetch the current runloader with AliRunLoader::GetRunLoader. If nothing is
+// currently loaded then kFALSE is returned and AliMUONDataInterface is reset.
+
+       Reset();
+       fRunloader = AliRunLoader::GetRunLoader();
+       if (fRunloader == NULL) return kFALSE;
+       // Fetch the current file name, folder name and event number.
+       fFilename = fRunloader->GetFileName();
+       fFoldername = fRunloader->GetEventFolder()->GetName();
+       fEventnumber = fRunloader->GetEventNumber();
+
+       if ( ! FetchMuonLoader(fFilename.Data(), fFoldername.Data()) )
+       {
+               Reset();
+               return kFALSE;
+       }               
+
+       return kTRUE;
+}
+
+
+Bool_t AliMUONDataInterface::FetchMuonLoader(TString filename, TString foldername)
+{
+       fMuonloader = fRunloader->GetLoader("MUONLoader");
+       if (fMuonloader == NULL)
+       {
+               AliError(Form("Could not find the MUON loader in file: %s and folder: %s", 
+                       (const char*)filename, (const char*)foldername));
+               return kFALSE;
+       }
+       
+       // Need to connect the muon loader to the AliMUONData object,
+       // else class to fData will return NULL.
+       fData.SetLoader(fMuonloader);
+       return kTRUE;
+}
+
+

 Bool_t AliMUONDataInterface::LoadLoaders(TString filename, TString foldername)
 {
 // Load the run and muon loaders from the specified file and folder.
 Bool_t AliMUONDataInterface::LoadLoaders(TString filename, TString foldername)
 {
 // Load the run and muon loaders from the specified file and folder.


@@ -90,19 +135,13 @@ Bool_t AliMUONDataInterface::LoadLoaders(TString filename, TString foldername)
                        (const char*)filename, (const char*)foldername));
                return kFALSE;
        }
                        (const char*)filename, (const char*)foldername));
                return kFALSE;
        }

-       fMuonloader = fRunloader->GetLoader("MUONLoader");
-       if (fMuonloader == NULL)
+       fCreatedRunLoader = kTRUE;
+       if ( ! FetchMuonLoader(filename, foldername) )

        {
        {

-               AliError(Form("Could not find the MUON loader in file: %s and folder: %s", 
-                       (const char*)filename, (const char*)foldername));

                fRunloader = NULL;
                return kFALSE;
        }
        
                fRunloader = NULL;
                return kFALSE;
        }
        

-       // Need to connect the muon loader to the AliMUONData object,
-       // else class to fData will return NULL.
-       fData.SetLoader(fMuonloader);
-       

        fFilename = filename;
        fFoldername = foldername;
        fEventnumber = -1;  // Reset the event number to force the event to be loaded.
        fFilename = filename;
        fFoldername = foldername;
        fEventnumber = -1;  // Reset the event number to force the event to be loaded.


@@ -123,6 +162,17 @@ Bool_t AliMUONDataInterface::FetchLoaders(TString filename, TString foldername)
                fRunloader = AliRunLoader::GetRunLoader();
                if (fRunloader == NULL)
                        return LoadLoaders(filename, foldername);
                fRunloader = AliRunLoader::GetRunLoader();
                if (fRunloader == NULL)
                        return LoadLoaders(filename, foldername);

+               else
+               {
+                       if (fMuonloader == NULL)
+                       {
+                               if ( ! FetchMuonLoader(filename, foldername) )
+                               {
+                                       fRunloader = NULL;
+                                       return kFALSE;
+                               }
+                       }
+               }

                
                // Fetch the current file and folder names.
                fFilename = fRunloader->GetFileName();
                
                // Fetch the current file and folder names.
                fFilename = fRunloader->GetFileName();


@@ -144,6 +194,8 @@ Bool_t AliMUONDataInterface::FetchEvent(Int_t event)
 {
 // Fetch the specified event from the runloader and reset all the track, cathode
 // and address flags to force them to be reloaded.
 {
 // Fetch the specified event from the runloader and reset all the track, cathode
 // and address flags to force them to be reloaded.

+// If a negative event number is specified then the current runloader event
+// number is used.

 
        if (fEventnumber < 0)
        {
 
        if (fEventnumber < 0)
        {


@@ -536,13 +588,13 @@ Int_t AliMUONDataInterface::NumberOfLocalTriggers(TString filename, TString fold
 
        if ( ! FetchLoaders(filename, foldername) ) return -1;
        if ( ! FetchEvent(event) ) return -1;
 
        if ( ! FetchLoaders(filename, foldername) ) return -1;
        if ( ! FetchEvent(event) ) return -1;

-       if ( ! FetchTreeR() ) return -1;
+       if ( ! FetchTreeD() ) return -1;

        if ( ! fTriggerAddressSet )
        {
                // If the local trigger address in TreeR is not set yet then set it now.
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();
        if ( ! fTriggerAddressSet )
        {
                // If the local trigger address in TreeR is not set yet then set it now.
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();

-               fData.GetTrigger();
+               fData.GetTriggerD();

                fTriggerAddressSet = kTRUE;
        }
        return fData.LocalTrigger()->GetEntriesFast();
                fTriggerAddressSet = kTRUE;
        }
        return fData.LocalTrigger()->GetEntriesFast();


@@ -558,13 +610,13 @@ AliMUONLocalTrigger* AliMUONDataInterface::LocalTrigger(
 
        if ( ! FetchLoaders(filename, foldername) ) return NULL;
        if ( ! FetchEvent(event) ) return NULL;
 
        if ( ! FetchLoaders(filename, foldername) ) return NULL;
        if ( ! FetchEvent(event) ) return NULL;

-       if ( ! FetchTreeR() ) return NULL;
+       if ( ! FetchTreeD() ) return NULL;

        if ( ! fTriggerAddressSet )
        {
                // If the local trigger address in TreeR is not set yet then set it now.
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();
        if ( ! fTriggerAddressSet )
        {
                // If the local trigger address in TreeR is not set yet then set it now.
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();

-               fData.GetTrigger();
+               fData.GetTriggerD();

                fTriggerAddressSet = kTRUE;
        }
        return static_cast<AliMUONLocalTrigger*>( fData.LocalTrigger()->At(trigger) );
                fTriggerAddressSet = kTRUE;
        }
        return static_cast<AliMUONLocalTrigger*>( fData.LocalTrigger()->At(trigger) );


@@ -916,12 +968,12 @@ Int_t AliMUONDataInterface::NumberOfLocalTriggers()
                return -1;
        }
 
                return -1;
        }
 

-       if ( ! FetchTreeR() ) return -1;
+       if ( ! FetchTreeD() ) return -1;

        if ( ! fTriggerAddressSet )
        {
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();
        if ( ! fTriggerAddressSet )
        {
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();

-               fData.GetTrigger();
+               fData.GetTriggerD();

                fTriggerAddressSet = kTRUE;
        }
        return fData.LocalTrigger()->GetEntriesFast();
                fTriggerAddressSet = kTRUE;
        }
        return fData.LocalTrigger()->GetEntriesFast();


@@ -944,12 +996,12 @@ AliMUONLocalTrigger* AliMUONDataInterface::LocalTrigger(Int_t trigger)
                return NULL;
        }
 
                return NULL;
        }
 

-       if ( ! FetchTreeR() ) return NULL;
+       if ( ! FetchTreeD() ) return NULL;

        if ( ! fTriggerAddressSet )
        {
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();
        if ( ! fTriggerAddressSet )
        {
                fData.SetTreeAddress("GLT");
                fData.ResetTrigger();

-               fData.GetTrigger();
+               fData.GetTriggerD();

                fTriggerAddressSet = kTRUE;
        }
        return static_cast<AliMUONLocalTrigger*>( fData.LocalTrigger()->At(trigger) );
                fTriggerAddressSet = kTRUE;
        }
        return static_cast<AliMUONLocalTrigger*>( fData.LocalTrigger()->At(trigger) );

diff --git a/MUON/AliMUONDataInterface.h b/MUON/AliMUONDataInterface.h
index 8e3cf2391b9b47b81c9540d6187fe21102ba62fd..0768793b926a46175a5c0b5ef8530f7d80b51280 100644 (file)
--- a/MUON/AliMUONDataInterface.h
+++ b/MUON/AliMUONDataInterface.h
@@ -44,6 +44,8 @@ public:
        
        // Sets all internal pointers to NULL without releasing the current runloader.
        void Reset();
        
        // Sets all internal pointers to NULL without releasing the current runloader.
        void Reset();

+
+       Bool_t UseCurrentRunLoader();

        
        Int_t NumberOfEvents(TString filename, TString foldername);
 
        
        Int_t NumberOfEvents(TString filename, TString foldername);
 


@@ -112,8 +114,10 @@ public:
 protected:
         AliMUONDataInterface(const AliMUONDataInterface& rhs);
         AliMUONDataInterface& operator=(const AliMUONDataInterface& rhs);
 protected:
         AliMUONDataInterface(const AliMUONDataInterface& rhs);
         AliMUONDataInterface& operator=(const AliMUONDataInterface& rhs);

+

 private:
 
 private:
 

+       Bool_t FetchMuonLoader(TString filename, TString foldername);

        Bool_t LoadLoaders(TString filename, TString foldername);
        Bool_t FetchLoaders(TString filename, TString foldername);
        Bool_t FetchEvent(Int_t event);
        Bool_t LoadLoaders(TString filename, TString foldername);
        Bool_t FetchLoaders(TString filename, TString foldername);
        Bool_t FetchEvent(Int_t event);


@@ -122,7 +126,8 @@ private:
        Bool_t FetchTreeS();
        Bool_t FetchTreeD();
        Bool_t FetchTreeR();
        Bool_t FetchTreeS();
        Bool_t FetchTreeD();
        Bool_t FetchTreeR();

-       
+
+       Bool_t fCreatedRunLoader;  //! If this object created the fRunloader then this flag is set.     

        
        Bool_t fHitAddressSet;     //! Flag specifying if the TTree address for the hit tree was set.
        Bool_t fSDigitAddressSet;  //! Flag specifying if the TTree address for the s-digit tree was set.
        
        Bool_t fHitAddressSet;     //! Flag specifying if the TTree address for the hit tree was set.
        Bool_t fSDigitAddressSet;  //! Flag specifying if the TTree address for the s-digit tree was set.