X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FMakeEMCALResMisAlignment.C;h=e89cbb3b9c7033c96fda17b1227ba3fb6ea160f0;hb=2614f1cb0fd101647eb2f951b40c312c339df7f8;hp=a1f2c76b750bfa1bba5d4fc729391471b92a3bad;hpb=289cc8a77f9cef5189ea5ad98ad9bbcef7df0bd7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/MakeEMCALResMisAlignment.C b/EMCAL/MakeEMCALResMisAlignment.C
index a1f2c76b750..e89cbb3b9c7 100644
--- a/EMCAL/MakeEMCALResMisAlignment.C
+++ b/EMCAL/MakeEMCALResMisAlignment.C
@@ -1,20 +1,21 @@
-void MakeEMCALResMisAlignment(){
+void MakeEMCALResMisAlignment(TString geoname = "EMCAL_COMPLETE12SMV1_DCAL_8SM"){
   // Create TClonesArray of residual misalignment objects for EMCAL
   //
   const char* macroname = "MakeEMCALResMisAlignment.C";
-  const AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaulGeometryName(),"");
-  if(!geom) {
+  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",geom->GetNumberOfSuperModules());
+  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;
@@ -42,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
@@ -51,7 +55,6 @@ void MakeEMCALResMisAlignment(){
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   Int_t i;
-  Int_t j=0;
 
   // RS = local
   // sigma translation = 1mm
@@ -60,28 +63,21 @@ void MakeEMCALResMisAlignment(){
   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++){
+  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=basepath;
+    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, kFALSE);
-  }
-
-  for(i=0; i<2; 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;
-    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( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){