X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FMakePHOSZeroMisAlignment.C;h=42d02fbea8d83e496fd390bd959e4f01e72c5db0;hb=3c759505f362cb280f68c4cb5c9566c65977b632;hp=97102753fed420983687b6ddb2c5c5005bf9a814;hpb=978b14f4dc1af6eba2f18c8c166966623f41ebe6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/MakePHOSZeroMisAlignment.C b/PHOS/MakePHOSZeroMisAlignment.C
index 97102753fed..42d02fbea8d 100644
--- a/PHOS/MakePHOSZeroMisAlignment.C
+++ b/PHOS/MakePHOSZeroMisAlignment.C
@@ -1,13 +1,18 @@
 void MakePHOSZeroMisAlignment(){
   // Create TClonesArray of zero 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("AliAlignObjAngles", 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);
@@ -54,8 +59,10 @@ void MakePHOSZeroMisAlignment(){
   new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel3",
 	volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
 
+  AliPHOSSurvey geodesicData;
+  geodesicData.CreateNullObjects(alobj, phosGeom);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if(!gSystem->Getenv("TOCDB")){
     // save on file
     TFile f("PHOSzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -64,13 +71,13 @@ void MakePHOSZeroMisAlignment(){
     f.Close();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliCDBManager *CDB = AliCDBManager::Instance();
     AliCDBStorage* storage = CDB->GetStorage(Storage);
     AliCDBMetaData *md= new AliCDBMetaData();
     md->SetResponsible("Yuri Kharlov");
     md->SetComment("Zero misalignment objects");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PHOS/Align/Data",0,9999999);
     storage->Put(array,id, md);
   }