Warnings fixed

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

diff --git a/PHOS/MakePHOSFullMisAlignment.C b/PHOS/MakePHOSFullMisAlignment.C
index 723b417682eb368889296e30a61deb7a7196d895..0d67ef766d178593c0ca9be7055b03f58c026d25 100644 (file)
--- a/PHOS/MakePHOSFullMisAlignment.C
+++ b/PHOS/MakePHOSFullMisAlignment.C
@@ -1,66 +1,106 @@
 void MakePHOSFullMisAlignment(){
   // Create TClonesArray of full misalignment objects for PHOS
   //
-  TClonesArray *array = new TClonesArray("AliAlignObjAngles",11);
+  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 dpsi=0., dtheta=0., dphi=0.;
   Double_t displacement = 10;
-
   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[0]) AliAlignObjAngles("PHOS/Module1",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module1",
          volid, -20., -10.,   0., dpsi, dtheta, 5, kTRUE);
-  new(alobj[1]) AliAlignObjAngles("PHOS/Module2",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module2",
          volid, -10.,   0., -10., dpsi, dtheta, 2, kTRUE);
-  new(alobj[2]) AliAlignObjAngles("PHOS/Module3",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module3",
          volid,   5., -10.,  10., dpsi, dtheta, 0, kTRUE);
-  new(alobj[3]) AliAlignObjAngles("PHOS/Module4",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module4",
          volid, +10.,  -0., -10., dpsi, dtheta, 2, kTRUE);
-  new(alobj[4]) AliAlignObjAngles("PHOS/Module5",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module5",
          volid, +20., -10.,   0., dpsi, dtheta, 5, kTRUE);
 
+  Double_t dx=0., dy=0., dz=0. ;
+  // Alignment of CPV modules
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module1/CPV",
+        volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module2/CPV",
+        volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module3/CPV",
+        volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module4/CPV",
+        volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[i++]) AliAlignObjParams("PHOS/Module5/CPV",
+        volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+ 
   // Alignment for PHOS cradle
-  new(alobj[5]) AliAlignObjAngles("PHOS/Cradle0",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Cradle0",
          volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[6]) AliAlignObjAngles("PHOS/Cradle1",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Cradle1",
          volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE);
 
   // Alignment for cradle wheels
-  new(alobj[7]) AliAlignObjAngles("PHOS/Wheel0",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Wheel0",
          volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[8]) AliAlignObjAngles("PHOS/Wheel1",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Wheel1",
          volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[9]) AliAlignObjAngles("PHOS/Wheel2",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Wheel2",
          volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[10]) AliAlignObjAngles("PHOS/Wheel3",
+  new(alobj[i++]) AliAlignObjParams("PHOS/Wheel3",
          volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE);
 
+//  AliPHOSSurvey geodesicData("phos_mod3_survey.txt");
+//  geodesicData.CreateAliAlignObjParams(alobj);
+
+  AliPHOSSurvey1 geodesicData("phos_mod3_survey_EDMS.txt", "T1_");
+  geodesicData.CreateAliAlignObjParams(alobj);
+
   // *************************    2nd step    ***************
 
-  if(!gSystem->Getenv("$TOCDB")){
+  const char* macroname = "MakePHOSFullMisAlignment.C";
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
-    TFile f("PHOSfullMisalignment.root","RECREATE");
-    if(!f) cerr<<"cannot open file for output\n";
+    const char* filename = "PHOSfullMisalignment.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,"PHOSFullObjs ","kSingleKey");
+    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("Alignment objects for fully misaligned geometry");
-    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);
   }