X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FMakeTOFFullMisAlignment.C;h=7fbeafaeca40fdde26103fb977401233248db468;hb=281613740638839619c51125a647bd06a2a6281a;hp=7fb6424bb02255d3f540becd6196c212a44f3535;hpb=a24be56b08ef731a32c600e49534f4c4beb9370c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/MakeTOFFullMisAlignment.C b/TOF/MakeTOFFullMisAlignment.C
index 7fb6424bb02..7fbeafaeca4 100644
--- a/TOF/MakeTOFFullMisAlignment.C
+++ b/TOF/MakeTOFFullMisAlignment.C
@@ -1,50 +1,56 @@
-void MakeTOFFullMisAlignment(){
+void MakeTOFFullMisAlignment() {
+  // 
   // Create TClonesArray of full misalignment objects for TOF
   // Expects to read objects for FRAME
   // 
-  TClonesArray *array = new TClonesArray("AliAlignObjParams",2000);
+
   const char* macroname = "MakeTOFFullMisAlignment.C";
+
+  TClonesArray *array = new TClonesArray("AliAlignObjParams",2000);
   
   // 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;
   TString Storage;
-  
-  if( TString(gSystem->Getenv("TOCDB")) == TString("kTRUE") ){
+
+  if ( TString(gSystem->Getenv("TOCDB")) == TString("kTRUE") ) {
     Storage = gSystem->Getenv("STORAGE");
-    if(!Storage.BeginsWith("local://") && !Storage.BeginsWith("alien://")) {
+    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){
+    if (!storage) {
       Error(macroname,"Unable to open storage %s\n",Storage.Data());
       return;
     }
     AliCDBPath path("GRP","Geometry","Data");
     AliCDBEntry *entry = storage->Get(path.GetPath(),cdb->GetRun());
-    if(!entry) Fatal(macroname,"Could not get the specified CDB entry!");
+    if (!entry)
+      Fatal(macroname,"Could not get the specified CDB entry!");
     entry->SetOwner(0);
     TGeoManager* geom = (TGeoManager*) entry->GetObject();
     AliGeomManager::SetGeometry(geom);
-  }else{
+  } else
     AliGeomManager::LoadGeometry(); //load geom from default CDB storage
-  }    
-		  
+
   // load FRAME full misalignment objects (if needed, the macro
   // for FRAME has to be run in advance) and apply them to geometry
   AliCDBPath fpath("GRP","Align","Data");
-  if( TString(gSystem->Getenv("TOCDB")) == TString("kTRUE") ){
+  if ( TString(gSystem->Getenv("TOCDB")) == TString("kTRUE") ) {
     Info(macroname,"Loading FRAME alignment objects from CDB storage %s",
-	Storage.Data());
+	 Storage.Data());
     AliCDBEntry *eFrame = storage->Get(fpath.GetPath(),cdb->GetRun());
-  }else{
+  } else
     AliCDBEntry *eFrame = cdb->Get(fpath.GetPath());
-  }
-  if(!eFrame) Fatal(macroname,"Could not get the specified CDB entry!");
+
+  if (!eFrame)
+    Fatal(macroname,"Could not get the specified CDB entry!");
+
   TClonesArray* arFrame = (TClonesArray*) eFrame->GetObject();
   arFrame->Sort();
   Int_t nvols = arFrame->GetEntriesFast();
@@ -54,7 +60,8 @@ void MakeTOFFullMisAlignment(){
     AliAlignObj* alobj = (AliAlignObj*) arFrame->UncheckedAt(j);
     if (alobj->ApplyToGeometry() == kFALSE) flag = kFALSE;
   }
-  if(!flag) Fatal(macroname,"Error in the application of FRAME alignment objects");
+  if (!flag)
+    Fatal(macroname,"Error in the application of FRAME alignment objects");
 
   //Produce objects for TOF supermodules
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
@@ -62,31 +69,29 @@ void MakeTOFFullMisAlignment(){
   UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy vol id 
 
   Int_t nSMTOF = 18;
-  Int_t sActive[18]={0,1,1,0,0,0,1,1,0,1,1,1,1,0,0,1,1,1};
   Int_t j=0;
   Double_t smdx, smdy, smdz=0., dpsi=0., dtheta, dphi=0.;
   TRandom *rnd   = new TRandom(2345);
   Double_t sigmatr = 0.4; // max shift in cm w.r.t. local ideal RS
   Double_t sigmarot = 0.06; // max rot in deg w.r.t. local ideal RS (~ 1 mrad)
   
-  for(Int_t iSect=0; iSect<nSMTOF; iSect++) {
-    TString symname(Form("TOF/sm%02d",iSect));
+  for (Int_t isect=0; isect<nSMTOF; isect++) {
+    TString symname(Form("TOF/sm%02d",isect));
     smdx = rnd->Gaus(0.,sigmatr);
     smdy = rnd->Gaus(0.,sigmatr);
     dtheta = rnd->Gaus(0.,sigmarot);
-    if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue;
-    new((*array)[j++]) AliAlignObjParams(symname.Data(), dvoluid, smdx, smdy, smdz, dpsi, dtheta, dphi, kFALSE);
+    new((*array)[j++]) AliAlignObjParams(symname.Data(),
+					 dvoluid,
+					 smdx, smdy, smdz, dpsi, dtheta, dphi, kFALSE);
   }
   // Apply objects for TOF supermodules 
   Int_t smCounter=0;
-  for(Int_t iSect=0; iSect<nSMTOF; iSect++){
-    if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue;
+  for (Int_t isect=0; isect<nSMTOF; isect++) {
     AliAlignObjParams* smobj = (AliAlignObjParams*)array->UncheckedAt(smCounter++);
-    Info(macroname,Form("Applying object for sector %d ",iSect));
-    if(!smobj->ApplyToGeometry()){
-      Fatal(macroname,Form("application of full misalignment object for sector %d failed!",iSect));
-      return;
-    }
+    //Info(macroname,Form("Applying object for sector %d ",isect));
+    if ( !smobj->ApplyToGeometry() )
+      Fatal(macroname,Form("application of full misalignment object for sector %d failed!",isect));
+
   }
 
   //Produce objects for TOF strips (same sigmas as for residual misalignment)
@@ -94,7 +99,7 @@ void MakeTOFFullMisAlignment(){
   Int_t strId=-1;
 
   Double_t sdx=0., sdy=0., sdz=0., sdpsi=0., sdtheta=0., sdphi=0.;
-  TRandom *rnds   = new TRandom(4357);
+  //TRandom *rnds   = new TRandom(4357);
   sigmatr = 0.1; // max shift in cm w.r.t. local ideal RS
 
   Int_t nstrA=15;
@@ -102,18 +107,51 @@ void MakeTOFFullMisAlignment(){
   Int_t nstrC=19;
   Int_t nSectors=18;
   Int_t nStrips=nstrA+2*nstrB+2*nstrC;
+  Double_t cuty=0., cutz=0., cut=3*sigmatr;
 
-  for (Int_t iSect = 0; iSect < nSectors; iSect++) {
+  for (Int_t isect = 0; isect < nSectors; isect++) {
     for (Int_t istr = 1; istr <= nStrips; istr++) {
-    sdy = rnds->Gaus(0.,sigmatr);
-    sdz = rnds->Gaus(0.,sigmatr);
+    switch (istr) {
+    case 25:
+    case 29:
+    case 63:
+    case 67:
+      cuty = sigmatr*0.6;
+      sdy  = AliMathBase::TruncatedGaus(0., sigmatr, cut, cuty);
+      sdz  = AliMathBase::TruncatedGaus(0., sigmatr, cut);
+      strId++;
+      break;
+      /*
+    case 38:
+      cuty = sigmatr*2.5;
+      cutz = sigmatr*2.5;
+      sdy  = AliMathBase::TruncatedGaus(0., sigmatr, cut, cuty);
+      sdz  = AliMathBase::TruncatedGaus(0., sigmatr, cut, cutz);
       strId++;
-      if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue;
-      new((*array)[j++]) AliAlignObjParams(AliGeomManager::SymName(idTOF,strId),AliGeomManager::LayerToVolUID(idTOF,strId), sdx, sdy, sdz, sdpsi, sdtheta, sdphi, kFALSE);
+      break;
+    case 54:
+      cuty = sigmatr*2.5;
+      cutz = sigmatr*2.5;
+      sdy  = AliMathBase::TruncatedGaus(0., sigmatr, cut, cuty);
+      sdz  = AliMathBase::TruncatedGaus(0., sigmatr, cutz, cut);
+      strId++;
+      break;
+      */
+    default:
+      sdy = AliMathBase::TruncatedGaus(0., sigmatr, cut);
+      sdz = AliMathBase::TruncatedGaus(0., sigmatr, cut);
+      strId++;
+      break;
+    }
+
+    if ((isect==13 || isect==14 || isect==15) && (istr >= 39 && istr <= 53)) continue;
+    new((*array)[j++]) AliAlignObjParams(AliGeomManager::SymName(idTOF,strId),
+					 AliGeomManager::LayerToVolUID(idTOF,strId),
+					 sdx, sdy, sdz, sdpsi, sdtheta, sdphi, kFALSE);
     }
   }
 
-  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
+  if ( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ) {
     // save in file
     const char* filename = "TOFfullMisalignment.root";
     TFile f(filename,"RECREATE");
@@ -125,7 +163,7 @@ void MakeTOFFullMisAlignment(){
     f.cd();
     f.WriteObject(array,"TOFAlignObjs","kSingleKey");
     f.Close();
-  }else{
+  } else {
     // save in CDB storage
     Info(macroname,"Saving alignment objects in CDB storage %s",
 	 Storage.Data());
@@ -141,4 +179,15 @@ void MakeTOFFullMisAlignment(){
 
 }
 
-
+/*
+Double_t LocalTruncatedGaus(Double_t mean, Double_t sigma, Double_t cutatL, Double_t cutatR)
+{
+  // return number generated according to a gaussian distribution N(mean,sigma) truncated at cutat
+  //
+  Double_t value;
+  do{
+    value=gRandom->Gaus(mean,sigma);
+  }while(value-mean<-cutatL || value-mean>cutatR);
+  return value;
+}
+*/