Some of the coding violations corrected

[u/mrichter/AliRoot.git] / TPC / AliTPCAlign.cxx

diff --git a/TPC/AliTPCAlign.cxx b/TPC/AliTPCAlign.cxx
index bc66e09705c307239d71eef8f2fbe7b6be3daa5c..3db43a2325171761868df6a20e002f30d3ec5cc8 100644 (file)
--- a/TPC/AliTPCAlign.cxx
+++ b/TPC/AliTPCAlign.cxx
@@ -15,6 +15,13 @@
 
 /*
 $Log$
+Revision 1.3  2007/10/22 14:20:25  kowal2
+Hardwired "ideal" coordinates replaced with those from the DCDB.
+Corrected bug in SetDebug method
+
+Revision 1.2  2007/10/03 09:27:50  marian
+Extra semicolon removed (Marian)
+
 Revision 1.1  2007/10/01 14:12:45  kowal2
 Class creating the aligmnent object fro the surveyor measurements.
 
@@ -25,6 +32,8 @@ Class creating the aligmnent object fro the surveyor measurements.
 //
 
 #include "AliTPCAlign.h"
+#include "AliSurveyPoint.h"
+#include "AliSurveyPoint.h"
 //
 #include "TROOT.h"
 #include "Riostream.h"
@@ -32,6 +41,7 @@ Class creating the aligmnent object fro the surveyor measurements.
 #include "TMath.h"
 #include "TSystem.h"
 #include "AliSurveyObj.h"
+#include "AliSurveyPoint.h"
 #include "AliAlignObjParams.h"
 #include "AliCDBStorage.h"
 #include <TClonesArray.h>
@@ -72,10 +82,13 @@ AliTPCAlign::AliTPCAlign(Int_t reportloc, Int_t reportglob) :
   fFileLoc = new Char_t[80];
   fFileGlob = new Char_t[80];
   Char_t path[50];
-  sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
+  //sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
+  snprintf(path,50,gSystem->Getenv("ALICE_ROOT"));
   //
-  sprintf(fFileLoc,"%s/TPC/Survey_%d_TPC.txt",path,reportloc);
-  sprintf(fFileGlob,"%s/TPC/Survey_%d_TPC.txt",path,reportglob);
+  //sprintf(fFileLoc,"%s/TPC/Survey_%d_TPC.txt",path,reportloc);
+  snprintf(fFileLoc,80,"%s/TPC/Survey_%d_TPC.txt",path,reportloc);
+  //sprintf(fFileGlob,"%s/TPC/Survey_%d_TPC.txt",path,reportglob);
+  snprintf(fFileGlob,80,"%s/TPC/Survey_%d_TPC.txt",path,reportglob);
   //
 
 }
@@ -155,37 +168,29 @@ Bool_t AliTPCAlign::LoadSurveyData(){
  //
  Float_t idealPoints[8][3];
  //
- idealPoints[0][0]=0.7973;
- idealPoints[0][1]=-2.5278;
- idealPoints[0][2]=3.0165;
- //
- idealPoints[1][0]=2.5873;
- idealPoints[1][1]=-0.5738;
- idealPoints[1][2]=3.0166;
- //
- idealPoints[2][0]=1.7898;
- idealPoints[2][1]=1.9540;
- idealPoints[2][2]=3.0164;
- //
- idealPoints[3][0]=-0.2237;
- idealPoints[3][1]=0.7055;
- idealPoints[3][2]=3.0161;
- //
- idealPoints[4][0]=-0.7230;
- idealPoints[4][1]=0.1598;
- idealPoints[4][2]=3.0162;
-//
- idealPoints[5][0]=0.2225;
- idealPoints[5][1]=-0.7058;
- idealPoints[5][2]=3.0166;
+ AliSurveyObj * s2 = new AliSurveyObj();
+ s2->FillFromLocalFile(fFileLoc);
  //
- idealPoints[6][0]=0.7224;
- idealPoints[6][1]=-0.1608;
- idealPoints[6][2]=3.0164;
+ TString pointNamesL[8] ={"R04","R05","R06","R07","R08","R10","R11","R12"};
  //
- idealPoints[7][0]=0.4999;
- idealPoints[7][1]=0.5452;
- idealPoints[7][2]=3.0164;
+  AliSurveyPoint *currPointL;
+  //
+ for(Int_t i=0;i<numberPoints;i++){
+   currPointL=0;
+   currPointL = (AliSurveyPoint *) s2->GetData()->FindObject(pointNamesL[i]);
+   if(currPointL){
+     idealPoints[i][0]=currPointL->GetY();
+     idealPoints[i][1]=currPointL->GetZ();
+     idealPoints[i][2]=currPointL->GetX();
+          if(fDebug)
+     Printf(Form("INFO: Point \"%s\" coordinates read.", pointNamesL[i].Data()));
+   }
+   else{
+     if(fDebug){
+    Printf(Form("ERROR: Essential point missing: \"%s\"", pointNamesL[i].Data()));
+    return 1; }
+   }
+ }
  //
  // Create and fill matrices a & y
  //
@@ -284,7 +289,7 @@ void AliTPCAlign::Run(){
 void AliTPCAlign::StoreAlignObj(){
   //
 AliCDBManager* cdb = AliCDBManager::Instance();
- if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+ if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
  //
 TClonesArray *array = new TClonesArray("AliAlignObjParams",1);
 //
@@ -302,7 +307,8 @@ TClonesArray *array = new TClonesArray("AliAlignObjParams",1);
     // save on file
     const char* filename = "TPCSurveyMisalignment.root";
     Char_t fullname[80];
-    sprintf(fullname,"%s/TPC/%s",gSystem->Getenv("ALICE_ROOT"),filename);
+    //sprintf(fullname,"%s/TPC/%s",gSystem->Getenv("ALICE_ROOT"),filename);
+    snprintf(fullname,80,"%s/TPC/%s",gSystem->Getenv("ALICE_ROOT"),filename);
     TFile *f = new TFile(fullname,"RECREATE");
     if(!f){
       AliError("cannot open file for output\n");