Bug fix

[u/mrichter/AliRoot.git] / STEER / AliSimulation.cxx

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 4ef68b1772e45d7dbff549c118a8b8ca717cd10a..2cc0e1f1fd53b655c53023d952a8541f9dd50660 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -272,9 +272,9 @@ void AliSimulation::InitCDBStorage()
     fCDBUri = "";
   }
   else {
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    AliWarning(Form("Default CDB storage is set to: %s",fCDBUri.Data()));
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliDebug(2,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliDebug(2, Form("Default CDB storage is set to: %s",fCDBUri.Data()));
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     man->SetDefaultStorage(fCDBUri);
   }
 
@@ -282,10 +282,10 @@ void AliSimulation::InitCDBStorage()
   for (Int_t i = 0; i < fSpecCDBUri.GetEntriesFast(); i++) {
     TObject* obj = fSpecCDBUri[i];
     if (!obj) continue;
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    AliWarning(Form("Specific CDB storage for %s is set to: %s",obj->GetName(),obj->GetTitle()));
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    man->SetSpecificStorage(obj->GetName(),obj->GetTitle());
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliDebug(2, Form("Specific CDB storage for %s is set to: %s",obj->GetName(),obj->GetTitle()));
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    man->SetSpecificStorage(obj->GetName(), obj->GetTitle());
   }
   man->Print();
 }
@@ -300,13 +300,19 @@ void AliSimulation::SetDefaultStorage(const char* uri) {
 }
 
 //_____________________________________________________________________________
-void AliSimulation::SetSpecificStorage(const char* detName, const char* uri) {
+void AliSimulation::SetSpecificStorage(const char* calibType, const char* uri) {
 // Store a detector-specific CDB storage location
 // Activate it later within the Run() method
 
-  TObject* obj = fSpecCDBUri.FindObject(detName);
+  AliCDBPath aPath(calibType);
+  if(!aPath.IsValid()){
+       AliError(Form("Not a valid path: %s", calibType));
+       return;
+  }
+
+  TObject* obj = fSpecCDBUri.FindObject(calibType);
   if (obj) fSpecCDBUri.Remove(obj);
-  fSpecCDBUri.Add(new TNamed(detName, uri));
+  fSpecCDBUri.Add(new TNamed(calibType, uri));
 
 }
 
@@ -366,7 +372,7 @@ Bool_t AliSimulation::ApplyAlignObjsToGeom(TObjArray* alObjArray)
     }
 
   if (AliDebugLevelClass() >= 1) {
-    gGeoManager->GetTopNode()->CheckOverlaps(20);
+    gGeoManager->GetTopNode()->CheckOverlaps(1);
     TObjArray* ovexlist = gGeoManager->GetListOfOverlaps();
     if(ovexlist->GetEntriesFast()){  
       AliError("The application of alignment objects to the geometry caused huge overlaps/extrusions!");
@@ -522,7 +528,7 @@ Bool_t AliSimulation::MisalignGeometry(AliRunLoader *runLoader)
        TObjArray* detArray = runLoader->GetAliRun()->Detectors();
        for (Int_t iDet = 0; iDet < detArray->GetEntriesFast(); iDet++) {
                AliModule* det = (AliModule*) detArray->At(iDet);
-               if (!det) continue;
+               if (!det || !det->IsActive()) continue;
                if (IsSelected(det->GetName(), detStr)) {
                        if(!SetAlignObjArraySingleDet(det->GetName())){
                                dataNotLoaded += det->GetName();
@@ -536,9 +542,9 @@ Bool_t AliSimulation::MisalignGeometry(AliRunLoader *runLoader)
   
        if ((detStr.CompareTo("ALL") == 0)) detStr = "";
        dataNotLoaded += detStr;
-       AliInfo(Form("Alignment data loaded for: %s",
+       if(!dataLoaded.IsNull()) AliInfo(Form("Alignment data loaded for: %s",
                          dataLoaded.Data()));
-       AliInfo(Form("Didn't/couldn't load alignment data for: %s",
+       if(!dataNotLoaded.IsNull()) AliInfo(Form("Didn't/couldn't load alignment data for: %s",
                          dataNotLoaded.Data()));
   } // fLoadAlignFromCDB flag
  
@@ -577,6 +583,9 @@ Bool_t AliSimulation::MisalignGeometry(AliRunLoader *runLoader)
 
   if (delRunLoader) delete runLoader;
 
+  // Update the TGeoPhysicalNodes
+  gGeoManager->RefreshPhysicalNodes();
+
   return kTRUE;
 }
 
@@ -704,7 +713,7 @@ Bool_t AliSimulation::RunTrigger(const char* descriptors)
      }
    }
 
-   runLoader->MakeTree( "CT" );
+   runLoader->MakeTree( "GG" );
    AliCentralTrigger* aCTP = runLoader->GetTrigger();
   // Load Descriptors
    aCTP->LoadDescriptor( des );
@@ -1131,7 +1140,9 @@ Bool_t AliSimulation::ConvertRawFilesToDate(const char* dateFileName)
 
   AliInfo(Form("converting raw data DDL files to DATE file %s", dateFileName));
   char command[256];
-  sprintf(command, "dateStream -D -o %s -# %d -C", 
+  // Note the option -s. It is used in order to avoid
+  // the generation of SOR/EOR events.
+  sprintf(command, "dateStream -s -D -o %s -# %d -C", 
          dateFileName, runLoader->GetNumberOfEvents());
   FILE* pipe = gSystem->OpenPipe(command, "w");
 
@@ -1182,10 +1193,10 @@ Bool_t AliSimulation::ConvertDateToRoot(const char* dateFileName,
 // convert a DATE file to a root file with the program "alimdc"
 
   // ALIMDC setup
-  const Int_t kDBSize = 1000000000;
+  const Int_t kDBSize = 2000000000;
   const Int_t kTagDBSize = 1000000000;
   const Bool_t kFilter = kFALSE;
-  const Int_t kCompression = 1;
+  const Int_t kCompression = 0;
 
   char* path = gSystem->Which(gSystem->Getenv("PATH"), "alimdc");
   if (!path) {
@@ -1200,7 +1211,6 @@ Bool_t AliSimulation::ConvertDateToRoot(const char* dateFileName,
 
   const char* rawDBFS[2] = { "/tmp/mdc1", "/tmp/mdc2" };
   const char* tagDBFS    = "/tmp/mdc1/tags";
-  const char* runDBFS    = "/tmp/mdc1/meta";
 
   // User defined file system locations
   if (gSystem->Getenv("ALIMDC_RAWDB1")) 
@@ -1209,18 +1219,14 @@ Bool_t AliSimulation::ConvertDateToRoot(const char* dateFileName,
     rawDBFS[1] = gSystem->Getenv("ALIMDC_RAWDB2");
   if (gSystem->Getenv("ALIMDC_TAGDB")) 
     tagDBFS = gSystem->Getenv("ALIMDC_TAGDB");
-  if (gSystem->Getenv("ALIMDC_RUNDB")) 
-    runDBFS = gSystem->Getenv("ALIMDC_RUNDB");
 
   gSystem->Exec(Form("rm -rf %s",rawDBFS[0]));
   gSystem->Exec(Form("rm -rf %s",rawDBFS[1]));
   gSystem->Exec(Form("rm -rf %s",tagDBFS));
-  gSystem->Exec(Form("rm -rf %s",runDBFS));
 
   gSystem->Exec(Form("mkdir %s",rawDBFS[0]));
   gSystem->Exec(Form("mkdir %s",rawDBFS[1]));
   gSystem->Exec(Form("mkdir %s",tagDBFS));
-  gSystem->Exec(Form("mkdir %s",runDBFS));
 
   Int_t result = gSystem->Exec(Form("alimdc %d %d %d %d %s", 
                                    kDBSize, kTagDBSize, kFilter, kCompression, dateFileName));
@@ -1229,7 +1235,6 @@ Bool_t AliSimulation::ConvertDateToRoot(const char* dateFileName,
   gSystem->Exec(Form("rm -rf %s",rawDBFS[0]));
   gSystem->Exec(Form("rm -rf %s",rawDBFS[1]));
   gSystem->Exec(Form("rm -rf %s",tagDBFS));
-  gSystem->Exec(Form("rm -rf %s",runDBFS));
 
   return (result == 0);
 }