Coding rule violations fixed.

[u/mrichter/AliRoot.git] / PHOS / MakePHOSZeroMisAlignment.C

diff --git a/PHOS/MakePHOSZeroMisAlignment.C b/PHOS/MakePHOSZeroMisAlignment.C
index 97102753fed420983687b6ddb2c5c5005bf9a814..edd78612766c0419790231106fb18714604eec5f 100644 (file)
--- a/PHOS/MakePHOSZeroMisAlignment.C
+++ b/PHOS/MakePHOSZeroMisAlignment.C
@@ -1,77 +1,100 @@
 void MakePHOSZeroMisAlignment(){
   // Create TClonesArray of zero misalignment objects for PHOS
   //
-  TClonesArray *array = new TClonesArray("AliAlignObjAngles",11);
+  const char* macroname = "MakePHOSZeroMisAlignment.C";
+  const AliPHOSGeometry *phosGeom = AliPHOSGeometry::GetInstance("IHEP", "IHEP");
+  if (!phosGeom) {
+    Error("MakePHOSFullMisAlignment", "Cannot obtain AliPHOSGeometry singleton\n");
+    return;
+  }
+
+  AliPHOSEMCAGeometry *emca = phosGeom->GetEMCAGeometry();
+  TClonesArray *array = new TClonesArray("AliAlignObjParams", 16 + phosGeom->GetNModules() * 
+                                         emca->GetNStripX() * emca->GetNStripZ());
   TClonesArray &alobj = *array;
    
-  AliAlignObjAngles a;
-
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
-
   Int_t iIndex=0; // let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
  
   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);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
-    TFile f("PHOSzeroMisalignment.root","RECREATE");
-    if(!f) cerr<<"cannot open file for output\n";
+    const char* filename = "PHOSzeroMisalignment.root";
+    TFile f(filename,"RECREATE");
+    if(!f){
+      Error(macroname,"cannot open file for output\n");
+      return;
+    }
+    Info(macroname,"Saving alignment objects to the file %s", filename);
     f.cd();
     f.WriteObject(array,"PHOSAlignObjs","kSingleKey");
     f.Close();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
-    AliCDBManager *CDB = AliCDBManager::Instance();
-    AliCDBStorage* storage = CDB->GetStorage(Storage);
+    TString Storage = gSystem->Getenv("STORAGE");
+    if(!Storage.BeginsWith("local://") && !Storage.BeginsWith("alien://")) {
+      Error(macroname,"STORAGE variable set to %s is not valid. Exiting\n",Storage.Data());
+      return;
+    }
+    Info(macroname,"Saving alignment objects in CDB storage %s",
+        Storage.Data());
+    AliCDBManager* cdb = AliCDBManager::Instance();
+    AliCDBStorage* storage = cdb->GetStorage(Storage.Data());
+    if(!storage){
+      Error(macroname,"Unable to open storage %s\n",Storage.Data());
+      return;
+    }
     AliCDBMetaData *md= new AliCDBMetaData();
     md->SetResponsible("Yuri Kharlov");
     md->SetComment("Zero misalignment objects");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
-    AliCDBId id("PHOS/Align/Data",0,9999999);
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
+    AliCDBId id("PHOS/Align/Data",0,AliCDBRunRange::Infinity());
     storage->Put(array,id, md);
   }