- Adding comments in newly added classes (in calign)

- Updated loadlibs.C
- Corrected libMUONcalign.pkg
(Andry)
- Moving AliMUONAlignment class from libMUONrec in libMUONcalign
(Ivana)

diff --git a/MUON/AliMUONChamberCalibrationTask.cxx b/MUON/AliMUONChamberCalibrationTask.cxx
index 7bc6237e8f7fdf0050fe80d47b03402d53bfaee3..6c6a5d477c699a5d6dbfda4b98e653cfc5e72c1c 100644 (file)
--- a/MUON/AliMUONChamberCalibrationTask.cxx
+++ b/MUON/AliMUONChamberCalibrationTask.cxx
@@ -240,17 +240,16 @@ void AliMUONChamberCalibrationTask::ConnectInputData( Option_t* /*option*/ )
 
       AliFatal( "Could not get input ESD event !!! ");
 
-    } else {
+    } 
+  } else {
 
       AliError( "Could not get input ESD handler !!!" );
       // If no input event handler we need to get the tree once
       // from input slot 0 for the chain
       tree = dynamic_cast<TTree*> (GetInputData(0));
       if ( tree ) tree->GetReadEntry();
-      else AliError( "Could not read tree from input slot 0 !!!" );
+      else AliFatal( "Could not read tree from input slot 0 !!!" );
     }
-  }
-
 }
 
 //______________________________________________________________
@@ -405,5 +404,9 @@ UInt_t AliMUONChamberCalibrationTask::BuildClusterMap( AliMUONTrack &track )
 //______________________________________________________________
 void AliMUONChamberCalibrationTask::Terminate( Option_t* /*option*/ )
 {
+  //
+  /// Called once per task on the client machine at the end of the analysis.
+  //
+
   AliDebug( 1, "" );
 }

diff --git a/MUON/AliMUONChamberCalibrationTask.h b/MUON/AliMUONChamberCalibrationTask.h
index 0081c063127c99dc48ad4bb063e8e5622c4a1bc2..998842f30a0c326bffa30a6b7910939bc553ffae 100644 (file)
--- a/MUON/AliMUONChamberCalibrationTask.h
+++ b/MUON/AliMUONChamberCalibrationTask.h
@@ -9,7 +9,7 @@
 /// \ingroup calign
 /// \class  AliMUONChamberCalibrationTask
 /// \brief  Definition of the task to extract cluster information 
-///  from MCH tracks after applying the calibration on aligned ESD
+///  from MCH tracks after applying the calibration on an aligned ESD
 /// \author Andry Rakotozafindrabe CEA/IRFU/SPhN
 
 class AliMUONRecoParam;
@@ -32,7 +32,8 @@ class AliMUONChamberCalibrationTask : public AliAnalysisTaskSE
 
  public:
 
-  enum Calibration_t { NOGAIN, GAINCONSTANTCAPA, GAIN, INJECTIONGAIN };
+  // enumarate the list of the available modes for the calibration
+  enum Calibration_t { NOGAIN, GAINCONSTANTCAPA, GAIN, INJECTIONGAIN }; 
   typedef Calibration_t Calibration_t;
 
   // Constructors
@@ -58,18 +59,18 @@ class AliMUONChamberCalibrationTask : public AliAnalysisTaskSE
 
  private:
 
-  char* fOCDBPath; //!< default path to the condition database
-  Calibration_t fCalibChoice; //!< calibration option
-  TTree* fClusterInfoTree; //!< TTree filled with the cluster information
-  AliMUONRecoParam* fMuonRecoParam; //!< reconstruction parameters for track refitting
-  AliMUONClusterInfo* fClusterInfo; //!< the cluster info used to fill the output TTree
-  AliMUONCalibrationData* fCalibData; 
-  AliMUONESDInterface* fESDInterface;
-  AliMUONVDigitStore* fDigitStore;
+  char* fOCDBPath;                      //!< default path to the condition database
+  Calibration_t fCalibChoice;           //!< calibration option
+  TTree* fClusterInfoTree;              //!< TTree filled with the cluster information
+  AliMUONRecoParam* fMuonRecoParam;     //!< reconstruction parameters for track refitting
+  AliMUONClusterInfo* fClusterInfo;     //!< cluster info used to fill the output TTree
+  AliMUONCalibrationData* fCalibData;   //!< needed to access to the calibration data for each pad within each cluster
+  AliMUONESDInterface* fESDInterface;   //!< interface to easily access to the ESD content
+  AliMUONVDigitStore* fDigitStore;      //<! pointer to the digit stored for the current input ESD event 
   AliESDInputHandler* fESDInputHandler; //!< ESD input handler
-  AliESDEvent* fESDInputEvent; //!< pointer to the current input ESD event
+  AliESDEvent* fESDInputEvent;          //!< pointer to the current input ESD event
 
-  ClassDef( AliMUONChamberCalibrationTask, 1 ) //Task to extract cluster information after applying calibration
+  ClassDef( AliMUONChamberCalibrationTask, 1 ) // Task to extract cluster information after applying calibration
 
 };
 

diff --git a/MUON/MUONcalignLinkDef.h b/MUON/MUONcalignLinkDef.h
index 317ab393e173d174caa751ca448f5ab4fc68eebe..7675f72bc96dc2f6115a9854db0944bbc9100447 100644 (file)
--- a/MUON/MUONcalignLinkDef.h
+++ b/MUON/MUONcalignLinkDef.h
@@ -14,6 +14,7 @@
 
 #pragma link C++ class AliMUONClusterInfo+;
 #pragma link C++ class AliMUONPadInfo+;
+#pragma link C++ class AliMUONAlignment+;
 #pragma link C++ class AliMUONAlignmentTask+;
 #pragma link C++ class AliMUONReAlignTask+;
 #pragma link C++ class AliMUONChamberCalibrationTask+;

diff --git a/MUON/MUONrecLinkDef.h b/MUON/MUONrecLinkDef.h
index 64e080bc6f6561871c82d0067986b5ae2e760da3..542782b445dcec1bb93d895a7333b1577ccc5163 100644 (file)
--- a/MUON/MUONrecLinkDef.h
+++ b/MUON/MUONrecLinkDef.h
@@ -22,7 +22,6 @@
 #pragma link C++ class AliMUONTrackExtrap+; 
 #pragma link C++ class AliMUONTriggerTrack+; 
 #pragma link C++ class AliMUONRecoTrack+; 
-#pragma link C++ class AliMUONAlignment+;
 #pragma link C++ class AliMUONVClusterFinder+;
 #pragma link C++ class AliMUONPad+;
 #pragma link C++ class AliMUONCluster+;

diff --git a/MUON/libMUONcalign.pkg b/MUON/libMUONcalign.pkg
index 691f3a7c2ae6d572b78fa0b5e2f40de95bce32fe..7fbb0d0e84a15dab14f62910dede8bd7c2bd5324 100644 (file)
--- a/MUON/libMUONcalign.pkg
+++ b/MUON/libMUONcalign.pkg
@@ -3,6 +3,7 @@
 
 SRCS:=  AliMUONClusterInfo.cxx \
         AliMUONPadInfo.cxx \
+        AliMUONAlignment.cxx \
         AliMUONAlignmentTask.cxx \
         AliMUONReAlignTask.cxx \
         AliMUONChamberCalibrationTask.cxx
@@ -15,5 +16,5 @@ EINCLUDE:= MUON/mapping
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-              -lMUONmapping -lMUONgeometry -lMUONcore -lCDB -lSTEERBase -lRAWDatabase -lANALYSIS 
+              -lMUONmapping -lMUONgeometry -lMUONcore -lCDB -lSTEERBase -lRAWDatabase -lANALYSIS  -lANALYSISalice
 endif

diff --git a/MUON/libMUONrec.pkg b/MUON/libMUONrec.pkg
index d12158b46dde84b003721760c335b3f2594674ab..cbd78510f15bf5185b69540c9a1053c1fba2c7ae 100644 (file)
--- a/MUON/libMUONrec.pkg
+++ b/MUON/libMUONrec.pkg
@@ -14,7 +14,6 @@ SRCS:= AliMUONReconstructor.cxx \
        AliMUONTriggerTrackStoreV1.cxx \
        AliMUONRecoTrack.cxx \
        AliMUONDigitCalibrator.cxx \
-       AliMUONAlignment.cxx \
        AliMUONVClusterFinder.cxx \
        AliMUONPreClusterFinder.cxx \
        AliMUONPreClusterFinderV2.cxx \

diff --git a/MUON/loadlibs.C b/MUON/loadlibs.C
index b80daaa8abd350965f15b27587d81df0d83a2f22..4970f81a5a93bbcc8576f087980f4811cbfbc9f4 100644 (file)
--- a/MUON/loadlibs.C
+++ b/MUON/loadlibs.C
@@ -38,7 +38,9 @@ void loadlibs ()
   gSystem->Load("libRAWDatabase");
   gSystem->Load("libRAWDatarec");
   gSystem->Load("libCDB");
-  gSystem->Load("libSTEER"); 
+  gSystem->Load("libSTEER");
+  gSystem->Load("libANALYSIS");
+  gSystem->Load("libANALYSISalice");
   
   gSystem->Load("libPhysics");
   gSystem->Load("libMUONcore");
@@ -60,6 +62,7 @@ void loadlibs ()
   gSystem->Load("libMUONsim");
   
   gSystem->Load("libMUONevaluation");
+  gSystem->Load("libMUONcalign");
   
   gSystem->Load("libMUONgraphics");
 }