further fixes

FairRootGroup · Jul 15, 2024 · 2510eb9 · 2510eb9
1 parent f7e69c2
commit 2510eb9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 15 deletions.
diff --git a/examples/MQ/pixelDetector/src/PixelDigiBinSource.cxx b/examples/MQ/pixelDetector/src/PixelDigiBinSource.cxx
@@ -143,11 +143,6 @@ Bool_t PixelDigiBinSource::ActivateObject(TObject** obj, const char* BrName)
     return kTRUE;
 }
 
-void PixelDigiBinSource::Close()
-{
-    fInputFile.close();
-}
-
 void PixelDigiBinSource::Reset() {}
 
 Int_t PixelDigiBinSource::CheckMaxEventNo(Int_t /*EvtEnd*/)

diff --git a/examples/MQ/pixelDetector/src/PixelDigiBinSource.h b/examples/MQ/pixelDetector/src/PixelDigiBinSource.h
@@ -33,7 +33,6 @@ class PixelDigiBinSource : public FairSource
     Bool_t Init() override;
 
     Int_t ReadEvent(UInt_t i = 0) override;
-    [[deprecated("Close will go away, the dtor closes resources")]] void Close() override;
     void Reset() override;
     Bool_t SpecifyRunId() override
     {

diff --git a/fairroot/base/sink/FairRootFileSink.cxx b/fairroot/base/sink/FairRootFileSink.cxx
@@ -68,13 +68,6 @@ FairRootFileSink::FairRootFileSink(const TString RootFileName, const char* Title
     LOG(debug) << "FairRootFileSink created------------";
 }
 
-FairRootFileSink::~FairRootFileSink()
-{
-    if (fRootFile) {
-        fRootFile->Close();
-    }
-}
-
 TFile* FairRootFileSink::OpenRootFile(TString fileName)
 {
     if (fileName.Length() <= 5)

diff --git a/fairroot/base/sink/FairRootFileSink.h b/fairroot/base/sink/FairRootFileSink.h
@@ -35,7 +35,6 @@ class FairRootFileSink : public FairSink
     FairRootFileSink(const TString RootFileName, const char* Title = "OutputRootFile");
     FairRootFileSink(const FairRootFileSink&) = delete;
     FairRootFileSink operator=(const FairRootFileSink&) = delete;
-    ~FairRootFileSink() override;
 
     Bool_t InitSink() override;
     void Reset() override;

diff --git a/fairroot/base/sink/FairSink.h b/fairroot/base/sink/FairSink.h
@@ -40,7 +40,7 @@ class FairSink
     virtual ~FairSink();
 
     virtual Bool_t InitSink() = 0;
-    [[deprecated("Close will go away, the dtor closes resources")]] virtual void Close(){};
+    [[deprecated("Close will go away, the dtor closes resources")]] virtual void Close() {}
     virtual void Reset() = 0;
 
     virtual Sink_Type GetSinkType() = 0;