X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FMakeEMCALResMisAlignment.C;h=e89cbb3b9c7033c96fda17b1227ba3fb6ea160f0;hb=752b48561050c4a98234c4f0025ae6d270036419;hp=90d6e24ba1ac306ff8387089952f34a140e91c25;hpb=6fce62af1975e067a08b96e421e6fec691ab4712;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/MakeEMCALResMisAlignment.C b/EMCAL/MakeEMCALResMisAlignment.C
index 90d6e24ba1a..e89cbb3b9c7 100644
--- a/EMCAL/MakeEMCALResMisAlignment.C
+++ b/EMCAL/MakeEMCALResMisAlignment.C
@@ -1,18 +1,26 @@
-void MakeEMCALResMisAlignment(){
+void MakeEMCALResMisAlignment(TString geoname = "EMCAL_COMPLETE12SMV1_DCAL_8SM"){
   // Create TClonesArray of residual misalignment objects for EMCAL
   //
-  TClonesArray *array = new TClonesArray("AliAlignObjParams",10);
-  TClonesArray &alobj = *array;
   const char* macroname = "MakeEMCALResMisAlignment.C";
+  if(geoname=="")geoname=AliEMCALGeometry::GetDefaultGeometryName();
+  const AliEMCALGeometry *emcalGeom = AliEMCALGeometry::GetInstance(geoname,"");
+  if(!emcalGeom) {
+    Error("MakeEMCALResMisAlignment","Cannot obtain AliEMCALGeometry singleton\n");
+    return;
+  }
+
+  TClonesArray *array = new TClonesArray("AliAlignObjParams",emcalGeom->GetNumberOfSuperModules());
+  TClonesArray &alobj = *array;
+
 
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage;
   
-  if( gSystem->Getenv("TOCDB") == TString("kTRUE") ){
+  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());
@@ -35,8 +43,11 @@ void MakeEMCALResMisAlignment(){
 
   Double_t dx, dy, dz, dpsi, dtheta, dphi;
 
-  const TString basepath = "EMCAL/FullSupermodule";
+  const TString fbasepath = "EMCAL/FullSupermodule";
   const TString hbasepath = "EMCAL/HalfSupermodule";
+  const TString tbasepath = "EMCAL/OneThrdSupermodule";
+  const TString dbasepath = "EMCAL/DCALSupermodule";
+  const TString debasepath= "EMCAL/DCALExtensionSM";
   TString pathstr;
 
   Int_t iIndex=0; // let all modules have index=0 in a layer with no LUT
@@ -44,40 +55,32 @@ void MakeEMCALResMisAlignment(){
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   Int_t i;
-  Int_t j=0;
 
   // RS = local
   // sigma translation = 1mm
   // sigma rotation = 0.1 degree
   TRandom *rnd   = new TRandom(4321);
-  Double_t sigmatr = 0.1; // max shift in cm w.r.t. local RS
+  Double_t sigmatr = 0.05; // max shift in cm w.r.t. local RS
   Double_t sigmarot = 0.1; // max rot in degrees w.r.t. local RS
 
-  for(i=0; i<10; i++){
-    dx = rnd->Gaus(0.,sigmatr);
-    dy = rnd->Gaus(0.,sigmatr);
-    dz = rnd->Gaus(0.,sigmatr);
-    dpsi = rnd->Gaus(0.,sigmarot);
-    dtheta = rnd->Gaus(0.,sigmarot);
-    dphi = rnd->Gaus(0.,sigmarot);
-    pathstr=basepath;
-    pathstr+=(i+1);
-    new(alobj[j++]) AliAlignObjParams(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
-  }
-
-  for(i=0; i<2; i++){
+  Int_t nSM = emcalGeom->GetEMCGeometry()->GetNumberOfSuperModules();
+  for(i=0; i<nSM; i++){
     dx = rnd->Gaus(0.,sigmatr);
     dy = rnd->Gaus(0.,sigmatr);
     dz = rnd->Gaus(0.,sigmatr);
     dpsi = rnd->Gaus(0.,sigmarot);
     dtheta = rnd->Gaus(0.,sigmarot);
     dphi = rnd->Gaus(0.,sigmarot);
-    pathstr=hbasepath;
+    if(     emcalGeom->GetSMType(i) == kEMCAL_Standard) pathstr=fbasepath;
+    else if(emcalGeom->GetSMType(i) == kEMCAL_Half    ) pathstr=hbasepath;
+    else if(emcalGeom->GetSMType(i) == kEMCAL_3rd     ) pathstr=tbasepath;
+    else if(emcalGeom->GetSMType(i) == kDCAL_Standard ) pathstr=dbasepath;
+    else if(emcalGeom->GetSMType(i) == kDCAL_Ext      ) pathstr=debasepath;
     pathstr+=(i+1);
-    new(alobj[j++]) AliAlignObjParams(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+    new(alobj[i]) AliAlignObjParams(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
   }
 
-  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
     const char* filename = "EMCALresidualMisalignment.root";
     TFile f(filename,"RECREATE");
@@ -92,8 +95,8 @@ void MakeEMCALResMisAlignment(){
   }else{
     // save in CDB storage
     AliCDBMetaData* md = new AliCDBMetaData();
-    md->SetResponsible("Jennifer Clay");
-    md->SetComment("Residual misalignment for EMCAL, produced with sigmatr=0.05 and sigmarot=0.3 in the local RS");
+    md->SetResponsible("Jennifer Klay");
+    md->SetComment("Residual misalignment for EMCAL, produced with sigmatr=0.05 and sigmarot=0.1 in the local RS");
     md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("EMCAL/Align/Data",0,AliCDBRunRange::Infinity());
     storage->Put(array,id,md);