From a45bb6dc9dfd69c234a77b99d82394d408f3ee49 Mon Sep 17 00:00:00 2001 From: kharlov Date: Tue, 6 Mar 2007 07:07:53 +0000 Subject: [PATCH] DP:Misalignment of CPV added --- PHOS/MakePHOSFullMisAlignment.C | 42 ++++++++++++++++++++---------- PHOS/MakePHOSResMisAlignment.C | 45 ++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/PHOS/MakePHOSFullMisAlignment.C b/PHOS/MakePHOSFullMisAlignment.C index 668f7955c8c..d1fd5c68011 100644 --- a/PHOS/MakePHOSFullMisAlignment.C +++ b/PHOS/MakePHOSFullMisAlignment.C @@ -13,38 +13,52 @@ void MakePHOSFullMisAlignment(){ AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex); + Int_t i=0 ; // Alignment for 5 PHOS modules - new(alobj[0]) AliAlignObjAngles("PHOS/Module1", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module1", volid, -20., -10., 0., dpsi, dtheta, 5, kTRUE); - new(alobj[1]) AliAlignObjAngles("PHOS/Module2", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module2", volid, -10., 0., -10., dpsi, dtheta, 2, kTRUE); - new(alobj[2]) AliAlignObjAngles("PHOS/Module3", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module3", volid, 5., -10., 10., dpsi, dtheta, 0, kTRUE); - new(alobj[3]) AliAlignObjAngles("PHOS/Module4", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module4", volid, +10., -0., -10., dpsi, dtheta, 2, kTRUE); - new(alobj[4]) AliAlignObjAngles("PHOS/Module5", + new(alobj[i++]) AliAlignObjAngles("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++]) AliAlignObjAngles("PHOS/Module1/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module2/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module3/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module4/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module5/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + // Alignment for PHOS cradle - new(alobj[5]) AliAlignObjAngles("PHOS/Cradle0", + new(alobj[i++]) AliAlignObjAngles("PHOS/Cradle0", volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[6]) AliAlignObjAngles("PHOS/Cradle1", + new(alobj[i++]) AliAlignObjAngles("PHOS/Cradle1", volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE); // Alignment for cradle wheels - new(alobj[7]) AliAlignObjAngles("PHOS/Wheel0", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel0", volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[8]) AliAlignObjAngles("PHOS/Wheel1", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel1", volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[9]) AliAlignObjAngles("PHOS/Wheel2", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel2", volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[10]) AliAlignObjAngles("PHOS/Wheel3", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel3", volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE); // ************************* 2nd step *************** - if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){ + if(!gSystem->Getenv("$TOCDB")){ // save on file TFile f("PHOSfullMisalignment.root","RECREATE"); if(!f) cerr<<"cannot open file for output\n"; @@ -53,13 +67,13 @@ void MakePHOSFullMisAlignment(){ 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("Alignment objects for fully misaligned geometry"); - md->SetAliRootVersion(gSystem->Getenv("ARVERSION")); + md->SetAliRootVersion(gSystem->Getenv("$ARVERSION")); AliCDBId id("PHOS/Align/Data",0,9999999); storage->Put(array,id, md); } diff --git a/PHOS/MakePHOSResMisAlignment.C b/PHOS/MakePHOSResMisAlignment.C index a84d6c83aee..f63b859fc91 100644 --- a/PHOS/MakePHOSResMisAlignment.C +++ b/PHOS/MakePHOSResMisAlignment.C @@ -12,37 +12,52 @@ void MakePHOSResMisAlignment(){ 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); - + + Int_t i=0 ; // Alignment for 5 PHOS modules - new(alobj[0]) AliAlignObjAngles("PHOS/Module1", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module1", volid, -0.20, -0.1, +0.0, dpsi, dtheta, 0.2, kTRUE); - new(alobj[1]) AliAlignObjAngles("PHOS/Module2", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module2", volid, -0.10, +0.0, -0.2, dpsi, dtheta, 0.2, kTRUE); - new(alobj[2]) AliAlignObjAngles("PHOS/Module3", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module3", volid, 0.05, -0.1, 0.2, dpsi, dtheta, 0.0, kTRUE); - new(alobj[3]) AliAlignObjAngles("PHOS/Module4", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module4", volid, +0.10, -0.0, -0.1, dpsi, dtheta, 0.1, kTRUE); - new(alobj[4]) AliAlignObjAngles("PHOS/Module5", + new(alobj[i++]) AliAlignObjAngles("PHOS/Module5", volid, +0.20, -0.1, 0.1, dpsi, dtheta, 0.2, kTRUE); + + Double_t dx=0., dy=0., dz=0. ; + // Alignment of CPV modules + new(alobj[i++]) AliAlignObjAngles("PHOS/Module1/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module2/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module3/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module4/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + new(alobj[i++]) AliAlignObjAngles("PHOS/Module5/CPV", + volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE); + // Alignment for PHOS cradle - new(alobj[5]) AliAlignObjAngles("PHOS/Cradle0", + new(alobj[i++]) AliAlignObjAngles("PHOS/Cradle0", volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[6]) AliAlignObjAngles("PHOS/Cradle1", + new(alobj[i++]) AliAlignObjAngles("PHOS/Cradle1", volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE); // Alignment for cradle wheels - new(alobj[7]) AliAlignObjAngles("PHOS/Wheel0", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel0", volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[8]) AliAlignObjAngles("PHOS/Wheel1", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel1", volid, 0., 0., -displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[9]) AliAlignObjAngles("PHOS/Wheel2", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel2", volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE); - new(alobj[10]) AliAlignObjAngles("PHOS/Wheel3", + new(alobj[i++]) AliAlignObjAngles("PHOS/Wheel3", volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE); - if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){ + if(!gSystem->Getenv("$TOCDB")){ // save on file TFile f("PHOSresidualMisalignment.root","RECREATE"); if(!f) cerr<<"cannot open file for output\n"; @@ -51,13 +66,13 @@ void MakePHOSResMisAlignment(){ 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("Alignment objects for slightly misaligned geometry (residual misalignment"); - md->SetAliRootVersion(gSystem->Getenv("ARVERSION")); + md->SetAliRootVersion(gSystem->Getenv("$ARVERSION")); AliCDBId id("PHOS/Align/Data",0,9999999); storage->Put(array,id, md); } -- 2.39.3