Correcting compiler warnings

[u/mrichter/AliRoot.git] / EMCAL / MakeEMCALFullMisAlignment.C

diff --git a/EMCAL/MakeEMCALFullMisAlignment.C b/EMCAL/MakeEMCALFullMisAlignment.C
index ca502270552025c1ce9056b563ffabdba90a68ef..79237b50920992cf3318a8a25bb8b5924f144a4a 100644 (file)
--- a/EMCAL/MakeEMCALFullMisAlignment.C
+++ b/EMCAL/MakeEMCALFullMisAlignment.C
@@ -17,15 +17,16 @@ void MakeEMCALFullMisAlignment(){
   // null shifts and rotations
 
   const TString basepath = "EMCAL/FullSupermodule";
+  const TString hbasepath = "EMCAL/HalfSupermodule";
   TString pathstr;
 
   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); //dummy volume identity
   Int_t i;
+  Int_t j=0;
 
   for(i=0; i<10; i++){
-
     dx = rnd->Gaus(0.,sigmatr);
     dy = rnd->Gaus(0.,sigmatr);
     dz = rnd->Gaus(0.,sigmatr);
@@ -35,10 +36,22 @@ void MakeEMCALFullMisAlignment(){
     pathstr=basepath;
     pathstr+=(i+1);
     cout<<pathstr<<"  "<<dx<<"  "<<dy<<"  "<<dz<<"  "<<dpsi<<"  "<<dtheta<<"  "<<dphi<<"\n";
-    new(alobj[i]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
+    new(alobj[j++]) AliAlignObjAngles(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++]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("EMCALfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -47,13 +60,13 @@ void MakeEMCALFullMisAlignment(){
     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("Jennifer Clay");
     md->SetComment("Full misalignment for EMCAL");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("EMCAL/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }