X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FMakeTOFZeroMisAlignment.C;h=18a4af5d9120436dd2e1cfbcd02d484d5572a781;hb=7148dc3778a1d6e0165d574ea6729ed82203931a;hp=c7e8fe0b204841c6786a7db02092aca13856369d;hpb=d3a9c52a8e655e35c86c18170ff4c8eacc2c7196;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/MakeTOFZeroMisAlignment.C b/TOF/MakeTOFZeroMisAlignment.C
index c7e8fe0b204..18a4af5d912 100644
--- a/TOF/MakeTOFZeroMisAlignment.C
+++ b/TOF/MakeTOFZeroMisAlignment.C
@@ -1,45 +1,97 @@
-void MakeTOFZeroMisAlignment(){
+void MakeTOFZeroMisAlignment() {
+  //
   // Create TClonesArray of zero misalignment objects for TOF
   //
-  TClonesArray *array = new TClonesArray("AliAlignObjAngles",2000);
+
+  const char* macroname = "MakeTOFZeroMisAlignment.C";
+
+  TClonesArray *array = new TClonesArray("AliAlignObjParams",2000);
   TClonesArray &alobj = *array;
-   
-  if(!gGeoManager) TGeoManager::Import("geometry.root");
-  // needed for the constructors with local coordinates not to fail
 
-  AliAlignObjAngles a;
+  // Activate CDB storage to load geometry from CDB
+  AliCDBManager* cdb = AliCDBManager::Instance();
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  cdb->SetRun(0);
+  
+  AliCDBStorage* storage;
+
+  if ( TString(gSystem->Getenv("TOCDB")) == TString("kTRUE") ) {
+    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;
+    }
+    storage = cdb->GetStorage(Storage.Data());
+    if (!storage) {
+      Error(macroname,"Unable to open storage %s\n",Storage.Data());
+      return;
+    }
+    AliCDBPath path("GRP","Geometry","Data");
+    AliCDBEntry *entry = (AliCDBEntry*)storage->Get(path.GetPath(),cdb->GetRun());
+    if (!entry)
+      Fatal(macroname,"Could not get the specified CDB entry!");
+
+    entry->SetOwner(0);
+    TGeoManager* geom = (TGeoManager*) entry->GetObject();
+    AliGeomManager::SetGeometry(geom);
+  } else
+    AliGeomManager::LoadGeometry(); //load geom from default CDB storage
+
 
-  AliAlignObj::ELayerID idTOF = AliAlignObj::kTOF;
-  Int_t i;
-  Int_t j=0;
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
+  AliGeomManager::ELayerID idTOF = AliGeomManager::kTOF;
+  Int_t j=0;
+  Int_t nSectors=18;
+
+  Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy vol id
 
-  for(i=0; i<AliAlignObj::LayerSize(idTOF); i++) {
-    new(alobj[j++]) AliAlignObjAngles(AliAlignObj::SymName(idTOF,i), AliAlignObj::LayerToVolUID(idTOF,i), dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  for (Int_t isect = 0; isect < nSectors; isect++) {
+    TString symname(Form("TOF/sm%02d",isect));
+    new(alobj[j++]) AliAlignObjParams(symname.Data(),
+				      dvoluid,
+				      dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  Int_t strId=-1;
+  Int_t nstrA=15;
+  Int_t nstrB=19;
+  Int_t nstrC=19;
+  Int_t nStrips=nstrA+2*nstrB+2*nstrC;
+
+  for (Int_t isect = 0; isect < nSectors; isect++) {
+    for (Int_t istr = 1; istr <= nStrips; istr++) {
+      strId++;
+      if ((isect==13 || isect==14 || isect==15) && (istr >= 39 && istr <= 53)) continue;
+      new(alobj[j++]) AliAlignObjParams(AliGeomManager::SymName(idTOF,strId),
+					AliGeomManager::LayerToVolUID(idTOF,strId),
+					dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+    }
+  }
+
+  if ( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ) {
     // save on file
-    TFile f("TOFzeroMisalignment.root","RECREATE");
-    if(!f) cerr<<"cannot open file for output\n";
+    const char* filename = "TOFzeroMisalignment.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,"TOFAlignObjs","kSingleKey");
     f.Close();
-  }else{
+  } else {
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
-    AliCDBManager* cdb = AliCDBManager::Instance();
-    AliCDBStorage* storage = cdb->GetStorage(Storage);
     AliCDBMetaData* md = new AliCDBMetaData();
     md->SetResponsible("Silvia Arcelli");
     md->SetComment("Zero misalignment for TOF");
     md->SetAliRootVersion("HEAD");
-    AliCDBId id("TOF/Align/Data",0,9999999);
+    AliCDBId id("TOF/Align/Data",0,AliCDBRunRange::Infinity());
     storage->Put(array,id,md);
   }
 
   array->Delete();
 
 }
-
-