Changed SetSampleRate to allow users to set the sample rate higher than 2. This is...

[u/mrichter/AliRoot.git] / FMD / AliFMDAlignFaker.cxx

diff --git a/FMD/AliFMDAlignFaker.cxx b/FMD/AliFMDAlignFaker.cxx
index 3f63b9b7036d97cc9994a5d5e9255abb4765246d..1eefe208c149d2c2b65dd8661ca0b503b95a0c29 100644 (file)
--- a/FMD/AliFMDAlignFaker.cxx
+++ b/FMD/AliFMDAlignFaker.cxx
@@ -38,15 +38,15 @@
 // storage `local://cdb' which is a directory in the current
 // directory. 
 //                                                       
-#include "AliLog.h"               // ALILOG_H
+#include "AliFMDDebug.h"               // ALIFMDDEBUG_H ALILOG_H
 #include "AliFMDAlignFaker.h"      // ALIFMDALIGNFAKER_H
 #include <AliCDBManager.h>         // ALICDBMANAGER_H
 #include <AliCDBStorage.h>         // ALICDBSTORAGE_H
 #include <AliCDBEntry.h>           // ALICDBMANAGER_H
 // #include <AliAlignObj.h>
-#include <AliAlignObjAngles.h>
+#include <AliAlignObjParams.h>
 // #include <Riostream.h>
-// #include <TSystem.h>
+#include <TSystem.h>
 // #include <TMath.h>
 #include <TRandom.h>
 #include <TClonesArray.h>
@@ -55,7 +55,7 @@
 #include <TGeoManager.h>
 #include <TGeoNode.h>
 // #include <TGeoVolume.h>
-// #include <TROOT.h>
+#include <TROOT.h>
 
 //====================================================================
 ClassImp(AliFMDAlignFaker)
@@ -77,7 +77,7 @@ AliFMDAlignFaker::AliFMDAlignFaker(Int_t mask, const char* geo,
     fHalfRotMin(0,0,0),
     fHalfRotMax(0,0,0),
     fRunMin(0),
-    fRunMax(9999999), 
+    fRunMax(AliCDBRunRange::Infinity()), 
     fArray(0),
     fComment("")
 {
@@ -161,7 +161,7 @@ AliFMDAlignFaker::Exec(Option_t*)
     return;
   }
   // Make container of transforms 
-  if (!fArray) fArray = new TClonesArray("AliAlignObjAngles");
+  if (!fArray) fArray = new TClonesArray("AliAlignObjParams");
   fArray->Clear();
   
   // Make an iterator
@@ -198,7 +198,7 @@ AliFMDAlignFaker::Exec(Option_t*)
                      alignName.Data(), path.Data()));
       alignName = path;
     }
-    AliDebug(1, Form("Making alignment for %s -> %s (%d)", 
+    AliFMDDebug(1, ("Making alignment for %s -> %s (%d)", 
                     alignName.Data(), path.Data(), id));
     if (IS_NODE_HALF(name))   MakeAlignHalf(alignName, id);
     if (IS_NODE_SENSOR(name)) MakeAlignSensor(alignName, id);
@@ -249,12 +249,12 @@ AliFMDAlignFaker::MakeAlign(const TString& path, Int_t id,
   //   rotX      Rotation about X-axis 
   //   rotY      Rotation about Y-axis
   //   rotZ      Rotation about Z-axis 
-  AliDebug(3, Form("Make alignment for %s (volume %d): (%f,%f,%f) (%f,%f,%f)", 
+  AliFMDDebug(3, ("Make alignment for %s (volume %d): (%f,%f,%f) (%f,%f,%f)", 
                   path.Data(), id, transX, transY, transZ, rotX, rotY, rotZ));
   Int_t nAlign = fArray->GetEntries();
   id = 0;
-  AliAlignObjAngles* obj = 
-    new ((*fArray)[nAlign]) AliAlignObjAngles(path.Data(),
+  AliAlignObjParams* obj = 
+    new ((*fArray)[nAlign]) AliAlignObjParams(path.Data(),
                                              id,0,0,0,0,0,0,kTRUE);
   if (!obj) {
     AliError(Form("Failed to create alignment object for %s", path.Data()));
@@ -272,7 +272,7 @@ Bool_t
 AliFMDAlignFaker::MakeAlignHalf(const TString& path, Int_t id)
 {
   // Make alignment of a half ring/cone 
-  AliDebug(15, Form("Make alignment for half-ring/cone %s", path.Data()));
+  AliFMDDebug(15, ("Make alignment for half-ring/cone %s", path.Data()));
   Double_t transX = gRandom->Uniform(fHalfTransMin.X(), fHalfTransMax.X());
   Double_t transY = gRandom->Uniform(fHalfTransMin.Y(), fHalfTransMax.Y());
   Double_t transZ = gRandom->Uniform(fHalfTransMin.Z(), fHalfTransMax.Z());
@@ -288,7 +288,7 @@ Bool_t
 AliFMDAlignFaker::MakeAlignSensor(const TString& path, Int_t id)
 {
   // Make alignment of a sensor 
-  AliDebug(15, Form("Make alignment for sensor %s", path.Data()));
+  AliFMDDebug(15, ("Make alignment for sensor %s", path.Data()));
   Double_t transX = gRandom->Uniform(fSensorTransMin.X(), fSensorTransMax.X());
   Double_t transY = gRandom->Uniform(fSensorTransMin.Y(), fSensorTransMax.Y());
   Double_t transZ = gRandom->Uniform(fSensorTransMin.Z(), fSensorTransMax.Z());