X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STEER%2FSTEER%2FAliReconstruction.cxx;h=c21aa1ebbd11d9f4dc1dd9aa3854ffa6f490f626;hp=9b71690d2ec25f7426129732e75eb9b864fdda5c;hb=175bf45841b7d25b1e30143df3ee6079f6848016;hpb=1f077f0cbefa1deb391850d9c371fc6e6cbcf668

diff --git a/STEER/STEER/AliReconstruction.cxx b/STEER/STEER/AliReconstruction.cxx
index 9b71690d2ec..c21aa1ebbd1 100644
--- a/STEER/STEER/AliReconstruction.cxx
+++ b/STEER/STEER/AliReconstruction.cxx
@@ -203,6 +203,7 @@
 #include "AliLHCData.h"
 #include "ARVersion.h"
 #include <RVersion.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/resource.h>
 ClassImp(AliReconstruction)
@@ -1695,9 +1696,7 @@ void AliReconstruction::Begin(TTree *)
   if(toCDBSnapshot)
   {
       AliCDBManager::Instance()->DumpToSnapshotFile(snapshotFileOut.Data(),kFALSE);
-      AliCDBManager::Instance()->UnloadFromCache("*/Align/*");
-      if(cdbCache->Contains("GRP/Calib/CosmicTriggers"))
-	  AliCDBManager::Instance()->UnloadFromCache("GRP/Calib/CosmicTriggers");
+      exit(0);
   }
 
   if (fInput && gProof) {
@@ -1975,9 +1974,9 @@ Bool_t AliReconstruction::ProcessEvent(Int_t iEvent)
   static Long_t oldMres=0;
   static Long_t oldMvir=0;
   static Float_t oldCPU=0;
-  static Long_t aveDMres=0;
-  static Long_t aveDMvir=0;
-  static Float_t aveDCPU=0;
+  // static Long_t aveDMres=0;
+  // static Long_t aveDMvir=0;
+  // static Float_t aveDCPU=0;
 
   AliCodeTimerAuto("",0);
 
@@ -4692,79 +4691,52 @@ void AliReconstruction::CheckRecoCDBvsSimuCDB()
     //
     AliInfo(Form("#%d Checking %s",i,cdbent->GetName()));
     //
-    // check in the simuCDB special params
+    // find cdbID used for sim
+    TString idSim="",storSim="";
+    TIter nextSim(cdbListSim);
+    while ((stro=(TObjString*)nextSim())) {
+      if (stro->GetString().Contains(cdbent->GetName())) {
+	idSim = stro->GetString();
+	break;
+      }
+    }    
+    // find the storage used for sim
+    // check in the simuCDB special paths
     pair = (TPair*)cdbMapSim->FindObject(cdbent->GetName());
-    TString idSimD = "";
-    TString idSimS = "";
     if (pair) { // specific path is used
-      idSimS = ((TObjString*)pair->Value())->GetString();
-      RectifyCDBurl(idSimS);
-    }
-    else { // check in default storage list
-      TIter nextSim(cdbListSim);
-      while ((stro=(TObjString*)nextSim())) {
-	if (stro->GetString().Contains(cdbent->GetName())) {
-	  idSimD = stro->GetString();
-	  break;
-	}
-      }
+      storSim = ((TObjString*)pair->Value())->GetString();
+      RectifyCDBurl(storSim);
     }
+    else storSim = defSimStore;  // default storage list is used
     //
-    // check in the recoCDB special params
+    if (!idSim.IsNull()) AliInfo(Form("Sim. used %s from %s",idSim.Data(), storSim.Data()));
+    else                 AliInfo("Sim. did not use this object");
+    //
+    // find cdbID used for rec
+    TString idRec="",storRec="";
+    TIter nextRec(cdbListRec);
+    AliCDBId* id=0;
+    while ((id=(AliCDBId*)nextRec())) {
+      idRec = id->ToString();
+      if (idRec.Contains(cdbent->GetName())) break;
+      idRec="";
+    }
+    //
+    // find storage used for the rec
     pair = (TPair*)cdbMapRec->FindObject(cdbent->GetName());
-    TString idRecD = "";
-    TString idRecS = "";
     if (pair) {  // specific path is used
-      idRecS = ((TObjString*)pair->Value())->GetString();
-      RectifyCDBurl(idRecS);
-    }
-    else { // check in default storage list
-      TIter nextRec(cdbListRec);
-      AliCDBId* id=0;
-      while ((id=(AliCDBId*)nextRec())) {
-	idRecD = id->ToString();
-	if (idRecD.Contains(cdbent->GetName())) break;
-	idRecD="";
-      }
+      storRec = ((TObjString*)pair->Value())->GetString();
+      RectifyCDBurl(storRec);
     }
-    //-----------------------------
-    Bool_t ok = kTRUE;
-    if (!idSimD.IsNull()) {  // simulation used object from default storage
-      AliInfo(Form("Simulation used default storage %s\nentry %s",defSimStore.Data(),idSimD.Data()));
-      if (!idRecD.IsNull()) { // reco also
-	AliInfo(Form("Reconstruction used default storage %s\nentry %s",defRecStore.Data(),idRecD.Data()));
-	if ( (idSimD!=idRecD) || (defSimStore!=defRecStore) ) ok = kFALSE;
-      }
-      else if (!idRecS.IsNull()) { // reco used specific storage, strict check of version is not possible
-	AliInfo(Form("Reconstruction used specific storage %s",idRecS.Data()));
-	if (defSimStore!=idRecS) ok = kFALSE;
-      }
-      else {
-	AliInfo("Did not find object used in reconstruction");
-	ok = kFALSE;
-      }
-    }
-    else if (!idSimS.IsNull()) { // simulation used object from specific storage
-      AliInfo(Form("Simulation used specific storage %s",idSimS.Data()));
-      if (!idRecS.IsNull()) { // reco also	
-	AliInfo(Form("Reconstruction used specific storage %s",idRecS.Data()));
-	if (idSimS!=idRecS) ok = kFALSE;
-      }
-      else if (!idRecD.IsNull()) {
-	AliInfo(Form("Reconstruction used default storage %s\nentry",idRecD.Data()));
-	if (idSimS!=defRecStore) ok = kFALSE;
-      }
-      else {
-	AliInfo("Did not find object used in reconstruction");
-	ok = kFALSE;
-      }      
-    }
-    else {
-      AliInfo("Did not find object used in simulation, assuming not needed and disabling the check");
-    }
-    if (!ok) AliFatal("Different objects were used in sim and rec");
+    else storRec = defRecStore; // default storage list is used
+    //
+    if (!idRec.IsNull()) AliInfo(Form("Rec. used %s from %s",idRec.Data(), storRec.Data()));
+    else                 AliInfo("Rec. did not use this object");
+    //
+    if (!idSim.IsNull() && !idRec.IsNull() && ((idSim!=idRec) || (storSim!=storRec)) ) 
+      AliFatal("Different objects were used in sim and rec");
   }
-  //
+  
 }
 
 //_________________________________________________________