Updated class for SSD survey (Panos)

diff --git a/ITS/AliITSSurveyToAlignSSD.cxx b/ITS/AliITSSurveyToAlignSSD.cxx
index 7748e7660d5d9eaa936407e2abbb67350e5afca3..24652d44281f3c6bc538cb7ce716b55d809915cc 100644 (file)
--- a/ITS/AliITSSurveyToAlignSSD.cxx
+++ b/ITS/AliITSSurveyToAlignSSD.cxx
@@ -49,8 +49,8 @@ ClassImp(AliITSSurveyToAlignSSD)
 AliITSSurveyToAlignSSD::AliITSSurveyToAlignSSD() :
   TObject(),
   fRun(0),
-  fFileLoc(0x0),
-  fFileGlob(0x0),
+  fFileLocal(0x0),
+  fFileGrid(0x0),
   fSurveyPoints(0),
   fSSDAlignObj(new TClonesArray("AliAlignObjParams",100)),
   fSSDAlignObjParam(0),
@@ -61,11 +61,11 @@ AliITSSurveyToAlignSSD::AliITSSurveyToAlignSSD() :
 }   
 
 //________________________________________________________________________
-AliITSSurveyToAlignSSD::AliITSSurveyToAlignSSD(Int_t /* run */, Int_t reportloc, Int_t reportglob) :
+AliITSSurveyToAlignSSD::AliITSSurveyToAlignSSD(Int_t reportId, Int_t runNumber) :
   TObject(),
   fRun(0),
-  fFileLoc(0x0),
-  fFileGlob(0x0),
+  fFileLocal(0x0),
+  fFileGrid(0x0),
   fSurveyPoints(0),
   fSSDAlignObj(new TClonesArray("AliAlignObjParams",100)),
   fSSDAlignObjParam(0),
@@ -73,22 +73,21 @@ AliITSSurveyToAlignSSD::AliITSSurveyToAlignSSD(Int_t /* run */, Int_t reportloc,
   //
   // constructor - defines data files
   //
-  fFileLoc = new Char_t[80];
-  fFileGlob = new Char_t[80];
+  fRun = runNumber;
+  fFileLocal = new Char_t[80];
+  fFileGrid = new Char_t[80];
   Char_t path[50];
-  sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
-  //
-  sprintf(fFileLoc,"%s/ITS/Survey_SSD_%d.txt",path,reportloc);  
-  sprintf(fFileGlob,"%s/ITS/Survey_SSD_%d.txt",path,reportglob);
-  //
 
+  sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
+  sprintf(fFileLocal,"%s/ITS/Survey_SSD_%d.txt",path,reportId);  
 }
+
 //_________________________________________________________________________
 AliITSSurveyToAlignSSD::AliITSSurveyToAlignSSD(const AliITSSurveyToAlignSSD &align) :
   TObject(),
   fRun(0),
-  fFileLoc(0x0),
-  fFileGlob(0x0),
+  fFileLocal(0x0),
+  fFileGrid(0x0),
   fSurveyPoints(0),
   fSSDAlignObj(new TClonesArray("AliAlignObjParams",100)),
   fSSDAlignObjParam(0),
@@ -131,7 +130,6 @@ void AliITSSurveyToAlignSSD::Run() {
   }
   CreateAlignObj();
   StoreAlignObj();
-  //
 }
 
 //__________________________________________________________________________
@@ -144,7 +142,7 @@ Bool_t AliITSSurveyToAlignSSD::LoadSurveyData() {
   
   //Load survey data from the local file
   AliSurveyObj * s1 = new AliSurveyObj();
-  if(s1->FillFromLocalFile(fFileGlob))
+  if(s1->FillFromLocalFile(fFileLocal))
     fSurveyPoints = s1->GetData();
   else 
     return kFALSE;
@@ -218,7 +216,6 @@ void AliITSSurveyToAlignSSD::StoreAlignObj(){
   }
   cout<<"Saving alignment objects to the file "<<filename<<endl;
   f->cd();
-  f->WriteObject(fSSDAlignObj,"SSDAlignObjs","kSingleKey");
+  f->WriteObject(fSSDAlignObj,"ITSAlignObjs","kSingleKey");
   f->Close();
-
 }

diff --git a/ITS/AliITSSurveyToAlignSSD.h b/ITS/AliITSSurveyToAlignSSD.h
index 6db7a96da163964dbe7fbcbc82e09d60f3e5d6d8..2fd6990c200089b549affaf778c49e6b02d82ece 100644 (file)
--- a/ITS/AliITSSurveyToAlignSSD.h
+++ b/ITS/AliITSSurveyToAlignSSD.h
@@ -12,6 +12,7 @@
 //                                                                     //
 //     Author: Panos.Christakoglou@cern.ch - NIKHEF/UU                 //
 /////////////////////////////////////////////////////////////////////////
+#include <TSystem.h>
 #include <TObjArray.h>
 #include <TClonesArray.h>
 
@@ -22,9 +23,17 @@ class AliITSSurveyToAlignSSD : public TObject {
 
  public:
   AliITSSurveyToAlignSSD();
-  AliITSSurveyToAlignSSD(Int_t /* run */, Int_t reportloc, Int_t reportglob);
+  AliITSSurveyToAlignSSD(Int_t reportId, Int_t runNumber);
   AliITSSurveyToAlignSSD(const AliITSSurveyToAlignSSD &align); // copy constructor
   AliITSSurveyToAlignSSD &operator = (const AliITSSurveyToAlignSSD &align); //assignment operator
+
+  void SetRun(Int_t runNumber) {fRun = runNumber;}
+  void SetReportId(Int_t reportId) {
+      fFileLocal = new Char_t[80];
+      Char_t path[50];
+      sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
+    sprintf(fFileLocal,"%s/ITS/Survey_SSD_%d.txt",path,reportId);  
+  }
   Bool_t LoadSurveyData();
   void CreateAlignObj();
   void Run();
@@ -33,9 +42,9 @@ class AliITSSurveyToAlignSSD : public TObject {
   virtual   ~AliITSSurveyToAlignSSD();
   //
  private:
-  Int_t   fRun;                         // the run number for the OCDB
-  Char_t *fFileLoc;                     // file with ideal points
-  Char_t *fFileGlob;                    // file with surveyed points
+  Int_t fRun;                           // run number 
+  Char_t *fFileLocal;                   // local file with surveyed points
+  Char_t *fFileGrid;                    // GRID file with surveyed points
   TObjArray *fSurveyPoints;             // array of survey points
   TClonesArray *fSSDAlignObj;           // TClonesArray of AliAlignObj
   AliAlignObjParams *fSSDAlignObjParam; // SSD alignment object param