X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FMakePHOSZeroMisAlignment.C;h=edd78612766c0419790231106fb18714604eec5f;hb=5b44e60c083f19dade82714d0fc29e8bde408613;hp=307f8380e2c29e24958c8a45dc2ae783dea861b1;hpb=dfe9c69dbd55e818acd5733c6a20f4e5ce5332d2;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/MakePHOSZeroMisAlignment.C b/PHOS/MakePHOSZeroMisAlignment.C
index 307f8380e2c..edd78612766 100644
--- a/PHOS/MakePHOSZeroMisAlignment.C
+++ b/PHOS/MakePHOSZeroMisAlignment.C
@@ -1,6 +1,7 @@
 void MakePHOSZeroMisAlignment(){
   // Create TClonesArray of zero misalignment objects for PHOS
   //
+  const char* macroname = "MakePHOSZeroMisAlignment.C";
   const AliPHOSGeometry *phosGeom = AliPHOSGeometry::GetInstance("IHEP", "IHEP");
   if (!phosGeom) {
     Error("MakePHOSFullMisAlignment", "Cannot obtain AliPHOSGeometry singleton\n");
@@ -8,7 +9,7 @@ void MakePHOSZeroMisAlignment(){
   }
 
   AliPHOSEMCAGeometry *emca = phosGeom->GetEMCAGeometry();
-  TClonesArray *array = new TClonesArray("AliAlignObjAngles", 16 + phosGeom->GetNModules() * 
+  TClonesArray *array = new TClonesArray("AliAlignObjParams", 16 + phosGeom->GetNModules() * 
                                          emca->GetNStripX() * emca->GetNStripZ());
   TClonesArray &alobj = *array;
    
@@ -19,51 +20,50 @@ void MakePHOSZeroMisAlignment(){
  
   Int_t i=0 ;
   // Alignment for 5 PHOS modules
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module1",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module1",
         volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module2",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module2",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module3",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module3",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module4",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module4",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module5",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module5",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
 
   // Alignment of CPV modules
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module1/CPV",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module1/CPV",
         volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module2/CPV",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module2/CPV",
         volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module3/CPV",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module3/CPV",
         volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module4/CPV",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module4/CPV",
         volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Module5/CPV",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module5/CPV",
         volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
  
 
   // Alignment for PHOS cradle
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Cradle0",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Cradle0",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Cradle1",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Cradle1",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
 
   // Alignment for cradle wheels
-  new(alobj[i++])  AliAlignObjAngles("PHOS/Wheel0",
+  new(alobj[i++])  AliAlignObjParams("PHOS/Wheel0",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++])  AliAlignObjAngles("PHOS/Wheel1",
+  new(alobj[i++])  AliAlignObjParams("PHOS/Wheel1",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++])  AliAlignObjAngles("PHOS/Wheel2",
+  new(alobj[i++])  AliAlignObjParams("PHOS/Wheel2",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel3",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Wheel3",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
 
   AliPHOSSurvey geodesicData;
   geodesicData.CreateNullObjects(alobj, phosGeom);
 
-  const char* macroname = "MakePHOSZeroMisAlignment.C";
-  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
     const char* filename = "PHOSzeroMisalignment.root";
     TFile f(filename,"RECREATE");