From 05b6df61efa01ae2edb2237281892970bab44978 Mon Sep 17 00:00:00 2001 From: cblume Date: Tue, 30 Sep 2008 12:29:54 +0000 Subject: [PATCH] Macros for partial geometry --- TRD/MakeTRDFullMisAlignment.C | 8 ++++---- TRD/MakeTRDResMisAlignment.C | 6 +++--- TRD/MakeTRDZeroMisAlignment.C | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TRD/MakeTRDFullMisAlignment.C b/TRD/MakeTRDFullMisAlignment.C index 5ef97e5f8c4..20612038d31 100644 --- a/TRD/MakeTRDFullMisAlignment.C +++ b/TRD/MakeTRDFullMisAlignment.C @@ -75,7 +75,7 @@ void MakeTRDFullMisAlignment(){ Double_t chry=1.0/1000/TMath::Pi()*180; // 1 mrad Double_t chrz=0.7/1000/TMath::Pi()*180; // 0.7 mrad - Int_t sActive[18]={0,0,1,1,1,0,1,0,0,0,0,1,1,0,1,1,0,0}; + Int_t sActive[18]={1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,1}; Double_t dx,dy,dz,rx,ry,rz; Int_t j=0; @@ -95,13 +95,13 @@ void MakeTRDFullMisAlignment(){ rx*=smrx; ry*=smry; rz*=smrz; - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; new((*array)[j++]) AliAlignObjParams(sm_symname.Data(),0,dx,dy,dz,rx,ry,rz,kFALSE); } // apply supermodules' alignment objects Int_t smCounter=0; for(Int_t iSect=0; iSect<18; iSect++){ - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; AliAlignObjParams* smobj = (AliAlignObjParams*)array->UncheckedAt(smCounter++); if(!smobj->ApplyToGeometry()){ @@ -129,8 +129,8 @@ void MakeTRDFullMisAlignment(){ chId++; if ((iSect==13 || iSect==14 || iSect==15) && iCh==2) continue; volid = AliGeomManager::LayerToVolUID(iLayer,chId); + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; symname = AliGeomManager::SymName(volid); - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; new((*array)[j++]) AliAlignObjParams(symname,volid,dx,dy,dz,rx,ry,rz,kFALSE); } } diff --git a/TRD/MakeTRDResMisAlignment.C b/TRD/MakeTRDResMisAlignment.C index 09a5df5735b..5d238ea40b9 100644 --- a/TRD/MakeTRDResMisAlignment.C +++ b/TRD/MakeTRDResMisAlignment.C @@ -41,7 +41,7 @@ void MakeTRDResMisAlignment(){ Double_t chry=0.3/1000/TMath::Pi()*180; // 0.3 mrad Double_t chrz=0.1/1000/TMath::Pi()*180; // 0.1 mrad - Int_t sActive[18]={0,0,1,1,1,0,1,0,0,0,0,1,1,0,1,1,0,0}; + Int_t sActive[18]={1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,1}; Double_t dx=0.,dy=0.,dz=0.,rx=0.,ry=0.,rz=0.; Int_t j=0; @@ -52,7 +52,7 @@ void MakeTRDResMisAlignment(){ // create the supermodules' alignment objects for (Int_t iSect=0; iSect<18; iSect++) { TString sm_symname(Form("TRD/sm%02d",iSect)); - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; new((*array)[j++]) AliAlignObjParams(sm_symname.Data(),0,dx,dy,dz,rx,ry,rz,kTRUE); } @@ -75,8 +75,8 @@ void MakeTRDResMisAlignment(){ chId++; if ((iSect==13 || iSect==14 || iSect==15) && iCh==2) continue; volid = AliGeomManager::LayerToVolUID(iLayer,chId); + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; symname = AliGeomManager::SymName(volid); - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; new(alobj[j++]) AliAlignObjParams(symname,volid,dx,dy,dz,rx,ry,rz,kFALSE); } } diff --git a/TRD/MakeTRDZeroMisAlignment.C b/TRD/MakeTRDZeroMisAlignment.C index 255e98d33de..ccfd10a2580 100644 --- a/TRD/MakeTRDZeroMisAlignment.C +++ b/TRD/MakeTRDZeroMisAlignment.C @@ -33,7 +33,7 @@ void MakeTRDZeroMisAlignment(){ AliGeomManager::LoadGeometry("geometry.root"); //load geom from default CDB storage } - Int_t sActive[18]={0,0,1,1,1,0,1,0,0,0,0,1,1,0,1,1,0,0}; + Int_t sActive[18]={1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,1}; Double_t dx=0.,dy=0.,dz=0.,rx=0.,ry=0.,rz=0.; Int_t j=0; @@ -43,7 +43,7 @@ void MakeTRDZeroMisAlignment(){ // create the supermodules' alignment objects for (Int_t iSect; iSect<18; iSect++) { TString sm_symname(Form("TRD/sm%02d",iSect)); - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; new(alobj[j++]) AliAlignObjParams(sm_symname.Data(),0,dx,dy,dz,rx,ry,rz,kTRUE); } @@ -56,8 +56,8 @@ void MakeTRDZeroMisAlignment(){ chId++; if ((iSect==13 || iSect==14 || iSect==15) && iCh==2) continue; volid = AliGeomManager::LayerToVolUID(iLayer,chId); + if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue; symname = AliGeomManager::SymName(volid); - if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue; new(alobj[j++]) AliAlignObjParams(symname,volid,dx,dy,dz,rx,ry,rz,kTRUE); } } -- 2.18.4