Skip to content

Commit

Permalink
Drop unused FairRootManager::fTimeStamps
Browse files Browse the repository at this point in the history
This field was only ever set, but never read.

After removing it, the method RunWithTimeStamps is now
empty. So deprecated it.
  • Loading branch information
ChristianTackeGSI authored and dennisklein committed Nov 11, 2022
1 parent 60e78f3 commit cb78b4e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 19 deletions.
1 change: 0 additions & 1 deletion base/steer/FairRootManager.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ FairRootManager::FairRootManager()
, fTSBufferMap()
, fWriteoutBufferMap()
, fInputBranchMap()
, fTimeStamps(kFALSE)
, fBranchPerMap(kFALSE)
, fBrPerMap()
, fBrPerMapIter()
Expand Down
10 changes: 5 additions & 5 deletions base/steer/FairRootManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ class FairRootManager : public TObject
FairWriteoutBuffer* RegisterWriteoutBuffer(TString branchName, FairWriteoutBuffer* buffer);
/**Update the list of time based branches in the output file*/
void UpdateListOfTimebasedBranches();
/**Use time stamps to read data and not tree entries*/
void RunWithTimeStamps() { fTimeStamps = kTRUE; }
/**Use time stamps to read data and not tree entries
* \deprecated Deprecated in v19, will be removed in v20.
*/
[[deprecated]] void RunWithTimeStamps() {}

/**Set the branch name list*/
void SetBranchNameList(TList* list);
Expand Down Expand Up @@ -374,8 +376,6 @@ class FairRootManager : public TObject
std::map<TString, FairTSBufferFunctional*> fTSBufferMap; //!
std::map<TString, FairWriteoutBuffer*> fWriteoutBufferMap; //!
std::map<Int_t, TBranch*> fInputBranchMap; //! //Map of input branch ID with TBranch pointer
/**if kTRUE Read data according to time and not entries*/
Bool_t fTimeStamps;
/**Flag for creation of Map for branch persistency list */
Bool_t fBranchPerMap;
/** Map for branch persistency list */
Expand Down Expand Up @@ -418,7 +418,7 @@ class FairRootManager : public TObject
// data members
Int_t fId; // This manager ID

ClassDefOverride(FairRootManager, 13);
ClassDefOverride(FairRootManager, 14);
};

// FIXME: move to source since we can make it non-template dependent
Expand Down
8 changes: 1 addition & 7 deletions base/steer/FairRunAna.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
Expand Down Expand Up @@ -196,11 +196,6 @@ void FairRunAna::Init()

FairBaseParSet* par = dynamic_cast<FairBaseParSet*>(fRtdb->getContainer("FairBaseParSet"));

/**Set the IO Manager to run with time stamps*/
if (fTimeStamps) {
fRootManager->RunWithTimeStamps();
}

// Assure that basic info is there for the run
// if(par && fInputFile) {
if (par && fInFileIsOpen) {
Expand Down Expand Up @@ -633,7 +628,6 @@ void FairRunAna::RunWithTimeStamps()
exit(-1);
} else {
fTimeStamps = kTRUE;
fRootManager->RunWithTimeStamps();
}
}
//_____________________________________________________________________________
Expand Down
7 changes: 1 addition & 6 deletions base/steer/FairRunAnaProof.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
Expand Down Expand Up @@ -156,11 +156,6 @@ void FairRunAnaProof::Init()
fRtdb = GetRuntimeDb();
FairBaseParSet* par = static_cast<FairBaseParSet*>(fRtdb->getContainer("FairBaseParSet"));

/**Set the IO Manager to run with time stamps*/
if (fTimeStamps) {
fRootManager->RunWithTimeStamps();
}

// create the output tree after tasks initialisation
fRootManager->InitSink();

Expand Down

0 comments on commit cb78b4e

Please sign in to comment.