3mm overlap corrected

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisDataContainer.cxx

diff --git a/ANALYSIS/AliAnalysisDataContainer.cxx b/ANALYSIS/AliAnalysisDataContainer.cxx
index 0724f0def942bd141e86c74d8c5e17d40ce1d463..4e3636774956dc9eacf37ae7b173dd634ebb77e8 100644 (file)
--- a/ANALYSIS/AliAnalysisDataContainer.cxx
+++ b/ANALYSIS/AliAnalysisDataContainer.cxx
@@ -59,6 +59,9 @@
 
 using std::endl;
 using std::cout;
+using std::ios;
+using std::setiosflags;
+using std::setprecision;
 ClassImp(AliAnalysisDataContainer)
 
 //______________________________________________________________________________
@@ -404,7 +407,7 @@ AliAnalysisDataWrapper *AliAnalysisDataContainer::ExportData() const
       return pack;
    } 
    AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-   if (mgr->GetDebugLevel() > 1) printf("   ExportData: Wrapping data %s for container %s\n", fData->GetName(),GetName());
+   if (mgr && mgr->GetDebugLevel() > 1) printf("   ExportData: Wrapping data %s for container %s\n", fData->GetName(),GetName());
    pack = new AliAnalysisDataWrapper(fData);
    pack->SetName(fName.Data());
    return pack;
@@ -421,7 +424,7 @@ void AliAnalysisDataContainer::ImportData(AliAnalysisDataWrapper *pack)
          return;
       }   
       AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-      if (mgr->GetDebugLevel() > 1) printf("   ImportData: Unwrapping data %s for container %s\n", fData->GetName(),GetName());
+      if (mgr && mgr->GetDebugLevel() > 1) printf("   ImportData: Unwrapping data %s for container %s\n", fData->GetName(),GetName());
       fDataReady = kTRUE;
       // Imported wrappers do not own data anymore (AG 13-11-07)
       pack->SetDeleteData(kFALSE);
@@ -612,7 +615,7 @@ void AliAnalysisFileDescriptor::Print(Option_t*) const
 }
 
 //______________________________________________________________________________
-void AliAnalysisFileDescriptor::SavePrimitive(ostream &out, Option_t *)
+void AliAnalysisFileDescriptor::SavePrimitive(std::ostream &out, Option_t *)
 {
 // Stream info to file
    const Double_t megabyte = 1048576.;
@@ -623,11 +626,13 @@ void AliAnalysisFileDescriptor::SavePrimitive(ostream &out, Option_t *)
    out << "image        " << fImage << endl;
    out << "nreplicas    " << fNreplicas << endl;
    out << "openstamp    " << fOpenedAt << endl;
-   out << setiosflags(ios::fixed) << setprecision(3);
+   std::ios_base::fmtflags original_flags = out.flags();
+   out << setiosflags(std::ios::fixed) << std::setprecision(3);
    out << "opentime     " << fOpenTime << endl;
    out << "runtime      " << fProcessingTime << endl;
    out << "filesize     " << fSize/megabyte << endl;
    out << "readsize     " << fReadBytes/megabyte << endl;
    out << "throughput   " << fThroughput << endl;
+   out.flags(original_flags);
 }
-   
+