Do not hardwire GMS file name, but use GetFileSources()

function

diff --git a/MUON/AliMUONGMSSubprocessor.cxx b/MUON/AliMUONGMSSubprocessor.cxx
index 3409188d8066d6a6f47305e33aca0e0551fd87a7..2958a346d0ef83801f7e53b75925118503a57f0c 100644 (file)
--- a/MUON/AliMUONGMSSubprocessor.cxx
+++ b/MUON/AliMUONGMSSubprocessor.cxx
@@ -30,6 +30,7 @@
 #include <TTimeStamp.h>
 #include <TFile.h>
 #include <TClonesArray.h>
 #include <TTimeStamp.h>
 #include <TFile.h>
 #include <TClonesArray.h>

+#include <TObjString.h>

 #include <Riostream.h>
 
 ClassImp(AliMUONGMSSubprocessor)
 #include <Riostream.h>
 
 ClassImp(AliMUONGMSSubprocessor)


@@ -38,7 +39,7 @@ const Int_t    AliMUONGMSSubprocessor::fgkSystem = AliPreprocessor::kDAQ;
 const TString  AliMUONGMSSubprocessor::fgkDataId = "GMS";
 const TString  AliMUONGMSSubprocessor::fgkMatrixArrayName = "GMSarray";
 
 const TString  AliMUONGMSSubprocessor::fgkDataId = "GMS";
 const TString  AliMUONGMSSubprocessor::fgkMatrixArrayName = "GMSarray";
 

-//______________________________________________________________________________________________
+//______________________________________________________________________________

 AliMUONGMSSubprocessor::AliMUONGMSSubprocessor(AliMUONPreprocessor* master) 
   : AliMUONVSubprocessor(master, "GMS", "Upload GMS matrices to OCDB"),
     fTransformer(true)
 AliMUONGMSSubprocessor::AliMUONGMSSubprocessor(AliMUONPreprocessor* master) 
   : AliMUONVSubprocessor(master, "GMS", "Upload GMS matrices to OCDB"),
     fTransformer(true)


@@ -47,31 +48,36 @@ AliMUONGMSSubprocessor::AliMUONGMSSubprocessor(AliMUONPreprocessor* master)
   fTransformer.ReadGeometryData("volpath.dat", "transform.dat");
 }
 
   fTransformer.ReadGeometryData("volpath.dat", "transform.dat");
 }
 

-//______________________________________________________________________________________________
+//______________________________________________________________________________

 AliMUONGMSSubprocessor::~AliMUONGMSSubprocessor()
 {
 /// Destructor
 }
 
 AliMUONGMSSubprocessor::~AliMUONGMSSubprocessor()
 {
 /// Destructor
 }
 

-//______________________________________________________________________________________________
-UInt_t AliMUONGMSSubprocessor::Process(TMap* /*dcsAliasMap*/)
+
+//
+// private methods
+//
+
+
+//______________________________________________________________________________
+UInt_t AliMUONGMSSubprocessor::ProcessFile(const TString& fileName)

 {
 /// Convert TGeoHMatrix to AliAlignObjMatrix and fill them into AliTestDataDCS object
 
 {
 /// Convert TGeoHMatrix to AliAlignObjMatrix and fill them into AliTestDataDCS object
 

-  const char* fileName 
-    = Master()->GetFile(fgkSystem, fgkDataId, fgkDataId);
-  if ( ! fileName) {
-    AliErrorStream() << "File not found" << endl;
-    return 1;
-  }  
+  AliInfoStream() << "Processing file " << fileName << endl;

 
   // Open root file
 
   // Open root file

-  TFile f(fileName);
+  TFile f(fileName.Data());
+  if ( ! f.IsOpen() ) {
+    AliErrorStream() << "Cannot open file " << fileName << endl;
+    return 1;
+  }  

   
   // Get array with matrices
   TClonesArray* array = (TClonesArray*)f.Get(fgkMatrixArrayName);
   if ( ! array ) {
   
   // Get array with matrices
   TClonesArray* array = (TClonesArray*)f.Get(fgkMatrixArrayName);
   if ( ! array ) {

-    AliErrorStream() << "TClonesArray with not found in file " 
+    AliErrorStream() << "TClonesArray not found in file " 

        << fileName << endl;
     return 1;
   }  
        << fileName << endl;
     return 1;
   }  


@@ -94,6 +100,29 @@ UInt_t AliMUONGMSSubprocessor::Process(TMap* /*dcsAliasMap*/)
   // Clear MisAlignArray in transformer
   fTransformer.ClearMisAlignmentData();
 
   // Clear MisAlignArray in transformer
   fTransformer.ClearMisAlignmentData();
 

+  return result;
+}  
+
+//
+// public methods
+//
+
+
+//______________________________________________________________________________
+UInt_t AliMUONGMSSubprocessor::Process(TMap* /*dcsAliasMap*/)
+{
+/// Process GMS alignment files
+
+  UInt_t result = 0;
+  TList* sources = Master()->GetFileSources(fgkSystem, fgkDataId);
+  TIter next(sources);
+  TObjString* o(0x0);
+  while ( ( o = static_cast<TObjString*>(next()) ) ) {
+    TString fileName(Master()->GetFile(fgkSystem, fgkDataId, o->GetName()));
+    result += ProcessFile(fileName);
+  }
+  delete sources;
+

   return result;
 }
 
   return result;
 }
 

diff --git a/MUON/AliMUONGMSSubprocessor.h b/MUON/AliMUONGMSSubprocessor.h
index 56de72d48be7a8f25a15f77ffc25ff2cb017342d..cbd193d70a4444781019398d2f5671b6bcd1a206 100644 (file)
--- a/MUON/AliMUONGMSSubprocessor.h
+++ b/MUON/AliMUONGMSSubprocessor.h
@@ -33,6 +33,9 @@ class AliMUONGMSSubprocessor : public AliMUONVSubprocessor
 
   private:
     AliMUONGMSSubprocessor(const AliMUONGMSSubprocessor&); // Not implemented
 
   private:
     AliMUONGMSSubprocessor(const AliMUONGMSSubprocessor&); // Not implemented

+
+    UInt_t ProcessFile(const TString& filename);
+

     // static data members
     static const Int_t    fgkSystem;           ///< The data system
     static const TString  fgkDataId;           ///< The data Id
     // static data members
     static const Int_t    fgkSystem;           ///< The data system
     static const TString  fgkDataId;           ///< The data Id