Fork me on GitHub

Changeset 341014c in git for external/ExRootAnalysis


Ignore:
Timestamp:
Feb 12, 2019, 9:29:17 PM (6 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
6455202
Parents:
45e58be
Message:

apply .clang-format to all .h, .cc and .cpp files

Location:
external/ExRootAnalysis
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • external/ExRootAnalysis/ExRootClassifier.h

    r45e58be r341014c  
    1111  virtual ~ExRootClassifier() {}
    1212  virtual Int_t GetCategory(TObject *object) = 0;
    13 
    1413};
    1514
    1615#endif /* ExRootClassifier */
    17 

  • external/ExRootAnalysis/ExRootConfReader.cc

    r45e58be r341014c  
    1414#include "TSystem.h"
    1515
     16#include <fstream>
     17#include <iomanip>
    1618#include <iostream>
    17 #include <iomanip>
    18 #include <fstream>
     19#include <sstream>
     20#include <stdexcept>
    1921#include <string>
    20 #include <stdexcept>
    21 #include <sstream>
    2222
    2323using namespace std;
    … …  
    186186int ModuleObjCmdProc(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
    187187{
    188   ExRootConfReader *reader = static_cast<ExRootConfReader*>(clientData);
     188  ExRootConfReader *reader = static_cast<ExRootConfReader *>(clientData);
    189189
    190190  if(objc < 3)
    … …  
    203203    Tcl_ListObjAppendElement(interp, object, Tcl_NewStringObj("namespace", -1));
    204204    Tcl_ListObjAppendElement(interp, object, Tcl_NewStringObj("eval", -1));
    205     Tcl_ListObjAppendList(interp, object, Tcl_NewListObj(objc-2, objv+2));
     205    Tcl_ListObjAppendList(interp, object, Tcl_NewListObj(objc - 2, objv + 2));
    206206
    207207    return Tcl_GlobalEvalObj(interp, object);
    … …  
    215215int SourceObjCmdProc(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
    216216{
    217   ExRootConfReader *reader = static_cast<ExRootConfReader*>(clientData);
     217  ExRootConfReader *reader = static_cast<ExRootConfReader *>(clientData);
    218218  stringstream fileName;
    219219
    … …  
    245245  if(fObject && TCL_OK != Tcl_GetIntFromObj(fTclInterp, fObject, &result))
    246246  {
    247     message << "parameter '"<< fName << "' is not an integer." << endl;
     247    message << "parameter '" << fName << "' is not an integer." << endl;
    248248    message << fName << " = " << Tcl_GetStringFromObj(fObject, 0);
    249249    throw runtime_error(message.str());
    … …  
    260260  if(fObject && TCL_OK != Tcl_GetLongFromObj(fTclInterp, fObject, &result))
    261261  {
    262     message << "parameter '"<< fName << "' is not an long integer." << endl;
     262    message << "parameter '" << fName << "' is not an long integer." << endl;
    263263    message << fName << " = " << Tcl_GetStringFromObj(fObject, 0);
    264264    throw runtime_error(message.str());
    … …  
    275275  if(fObject && TCL_OK != Tcl_GetDoubleFromObj(fTclInterp, fObject, &result))
    276276  {
    277     message << "parameter '"<< fName << "' is not a number." << endl;
     277    message << "parameter '" << fName << "' is not a number." << endl;
    278278    message << fName << " = " << Tcl_GetStringFromObj(fObject, 0);
    279279    throw runtime_error(message.str());
    … …  
    290290  if(fObject && TCL_OK != Tcl_GetBooleanFromObj(fTclInterp, fObject, &result))
    291291  {
    292     message << "parameter '"<< fName << "' is not a boolean." << endl;
     292    message << "parameter '" << fName << "' is not a boolean." << endl;
    293293    message << fName << " = " << Tcl_GetStringFromObj(fObject, 0);
    294294    throw runtime_error(message.str());
    … …  
    314314  if(fObject && TCL_OK != Tcl_ListObjLength(fTclInterp, fObject, &length))
    315315  {
    316     message << "parameter '"<< fName << "' is not a list." << endl;
     316    message << "parameter '" << fName << "' is not a list." << endl;
    317317    message << fName << " = " << Tcl_GetStringFromObj(fObject, 0);
    318318    throw runtime_error(message.str());
    … …  
    329329  if(fObject && TCL_OK != Tcl_ListObjIndex(fTclInterp, fObject, index, &object))
    330330  {
    331     message << "parameter '"<< fName << "' is not a list." << endl;
     331    message << "parameter '" << fName << "' is not a list." << endl;
    332332    message << fName << " = " << Tcl_GetStringFromObj(fObject, 0);
    333333    throw runtime_error(message.str());

  • external/ExRootAnalysis/ExRootConfReader.h

    r45e58be r341014c  
    2121{
    2222public:
    23 
    2423  ExRootConfParam(const char *name = 0, Tcl_Obj *object = 0, Tcl_Interp *interp = 0);
    2524
    … …  
    3433
    3534private:
    36 
    3735  const char *fName; //!
    3836  Tcl_Obj *fObject; //!
    … …  
    4240//------------------------------------------------------------------------------
    4341
    44 class ExRootConfReader : public TNamed
     42class ExRootConfReader: public TNamed
    4543{
    4644public:
    … …  
    6664
    6765private:
    68 
    6966  const char *fTopDir; //!
    7067
    … …  
    7774
    7875#endif
    79 

  • external/ExRootAnalysis/ExRootFilter.cc

    r45e58be r341014c  
    1111#include "ExRootAnalysis/ExRootClassifier.h"
    1212
     13#include "TObjArray.h"
    1314#include "TSeqCollection.h"
    14 #include "TObjArray.h"
    1515
    1616#include <iostream>
     17#include <sstream>
    1718#include <stdexcept>
    18 #include <sstream>
    1919
    2020using namespace std;
    2121
    22 typedef map<Int_t, TObjArray*> TCategoryMap;
    23 typedef map<ExRootClassifier*, pair<Bool_t, TCategoryMap> > TClassifierMap;
     22typedef map<Int_t, TObjArray *> TCategoryMap;
     23typedef map<ExRootClassifier *, pair<Bool_t, TCategoryMap>> TClassifierMap;
    2424
    2525ExRootFilter::ExRootFilter(const TSeqCollection *collection) :
    … …  
    4040        itSubMap != itMap->second.second.end(); ++itSubMap)
    4141    {
    42       delete (itSubMap->second);
     42      delete(itSubMap->second);
    4343    }
    4444  }
    … …  
    132132
    133133//------------------------------------------------------------------------------
    134 

  • external/ExRootAnalysis/ExRootFilter.h

    r45e58be r341014c  
    1414{
    1515public:
    16 
    1716  ExRootFilter(const TSeqCollection *collection);
    1817  ~ExRootFilter();
    … …  
    2322
    2423private:
    25 
    2624  const TSeqCollection *fCollection; //!
    2725  TIterator *fIter; //!
    2826
    29   std::map<ExRootClassifier*, std::pair<Bool_t, std::map<Int_t, TObjArray*> > > fMap; //!
    30 
     27  std::map<ExRootClassifier *, std::pair<Bool_t, std::map<Int_t, TObjArray *>>> fMap; //!
    3128};
    3229
    3330#endif /* ExRootFilter */
    34 

  • external/ExRootAnalysis/ExRootProgressBar.cc

    r45e58be r341014c  
    1414#include <iostream>
    1515
     16#include <stdio.h>
    1617#include <string.h>
    17 #include <stdio.h>
    1818
    1919using namespace std;
    … …  
    4646  if(fEntries > 0)
    4747  {
    48     Int_t hashes = Int_t(Double_t(entry)/fEntries*fWidth);
     48    Int_t hashes = Int_t(Double_t(entry) / fEntries * fWidth);
    4949    if(hashes > fWidth) hashes = fWidth;
    5050    if(hashes != fHashes)
    … …  
    5353      memset(fBar + hashes, '-', fWidth - hashes);
    5454      fHashes = hashes;
    55       fprintf(stderr, "** [%s] (%.2f%%)\r", fBar, Float_t(entry)/fEntries*100.0);
     55      fprintf(stderr, "** [%s] (%.2f%%)\r", fBar, Float_t(entry) / fEntries * 100.0);
    5656    }
    5757  }
    … …  
    7777
    7878//------------------------------------------------------------------------------
    79 

  • external/ExRootAnalysis/ExRootProgressBar.h

    r45e58be r341014c  
    77{
    88public:
    9 
    109  ExRootProgressBar(Long64_t entries, Int_t width = 64);
    1110  ~ExRootProgressBar();
    … …  
    1514
    1615private:
    17 
    1816  Long64_t fEntries, fEventCounter;
    1917  Int_t fWidth;
    … …  
    2321
    2422  char *fBar; //!
    25 
    2623};
    2724
    2825#endif /* ExRootProgressBar */
    29 

  • external/ExRootAnalysis/ExRootResult.cc

    r45e58be r341014c  
    1212#include "ExRootAnalysis/ExRootUtilities.h"
    1313
    14 #include "TROOT.h"
     14#include "TCanvas.h"
     15#include "TClass.h"
    1516#include "TFile.h"
    16 #include "TClass.h"
    17 #include "TStyle.h"
    18 #include "TCanvas.h"
    19 #include "TLegend.h"
    20 #include "TPaveText.h"
    21 #include "TPaveStats.h"
    22 #include "TList.h"
     17#include "TFolder.h"
    2318#include "TH2.h"
    2419#include "THStack.h"
     20#include "TLegend.h"
     21#include "TList.h"
     22#include "TObjArray.h"
     23#include "TPaveStats.h"
     24#include "TPaveText.h"
    2525#include "TProfile.h"
    26 #include "TObjArray.h"
    27 #include "TFolder.h"
     26#include "TROOT.h"
     27#include "TStyle.h"
    2828
    2929#include <iostream>
    … …  
    3737//------------------------------------------------------------------------------
    3838
    39 ExRootResult::ExRootResult() : fCanvas(0), fFolder(0)
     39ExRootResult::ExRootResult() :
     40  fCanvas(0), fFolder(0)
    4041{
    4142}
    … …  
    4546ExRootResult::~ExRootResult()
    4647{
    47   set<TObject*>::iterator itPool;
     48  set<TObject *>::iterator itPool;
    4849  for(itPool = fPool.begin(); itPool != fPool.end(); ++itPool)
    4950  {
    … …  
    6869  TFile *file = new TFile(fileName, "RECREATE");
    6970  file->cd();
    70   std::map<TObject*, PlotSettings>::iterator itPlotMap;
     71  std::map<TObject *, PlotSettings>::iterator itPlotMap;
    7172  for(itPlotMap = fPlotMap.begin(); itPlotMap != fPlotMap.end(); ++itPlotMap)
    7273  {
    … …  
    123124  // gStyle->SetOptFit(101);
    124125
    125   fCanvas = static_cast<TCanvas*>(gROOT->FindObject("c1"));
     126  fCanvas = static_cast<TCanvas *>(gROOT->FindObject("c1"));
    126127  if(fCanvas)
    127128  {
    … …  
    154155  if(!plot) return;
    155156
    156   std::map<TObject*, PlotSettings>::iterator itPlotMap = fPlotMap.find(plot);
     157  std::map<TObject *, PlotSettings>::iterator itPlotMap = fPlotMap.find(plot);
    157158  if(itPlotMap != fPlotMap.end())
    158159  {
    … …  
    178179  if(plot->IsA()->InheritsFrom(TH1::Class()))
    179180  {
    180     histogram = static_cast<TH1*>(plot);
    181   }
    182 
    183   map<TObject*, PlotSettings>::iterator itPlotMap = fPlotMap.find(plot);
     181    histogram = static_cast<TH1 *>(plot);
     182  }
     183
     184  map<TObject *, PlotSettings>::iterator itPlotMap = fPlotMap.find(plot);
    184185  if(itPlotMap != fPlotMap.end())
    185186  {
    … …  
    224225  TCanvas *canvas = GetCanvas();
    225226
    226   map<TObject*, PlotSettings>::iterator itPlotMap;
     227  map<TObject *, PlotSettings>::iterator itPlotMap;
    227228
    228229  for(itPlotMap = fPlotMap.begin(); itPlotMap != fPlotMap.end(); ++itPlotMap)
    … …  
    236237    if(object->IsA()->InheritsFrom(TH1::Class()))
    237238    {
    238       histogram = static_cast<TH1*>(object);
     239      histogram = static_cast<TH1 *>(object);
    239240    }
    240241    else if(object->IsA()->InheritsFrom(THStack::Class()))
    241242    {
    242       stack = static_cast<THStack*>(object);
    243       histogram = static_cast<TH1*>(stack->GetHists()->First());
     243      stack = static_cast<THStack *>(object);
     244      histogram = static_cast<TH1 *>(stack->GetHists()->First());
    244245    }
    245246
    … …  
    271272    if(histogram)
    272273    {
    273       stats = static_cast<TPaveStats*>(histogram->FindObject("stats"));
     274      stats = static_cast<TPaveStats *>(histogram->FindObject("stats"));
    274275      if(stats)
    275276      {
    … …  
    300301
    301302TH1 *ExRootResult::AddHist1D(const char *name, const char *title,
    302                              const char *xlabel, const char *ylabel,
    303                              Int_t nxbins, Axis_t xmin, Axis_t xmax,
    304                              Int_t logx, Int_t logy)
     303  const char *xlabel, const char *ylabel,
     304  Int_t nxbins, Axis_t xmin, Axis_t xmax,
     305  Int_t logx, Int_t logy)
    305306{
    306307  TH1F *hist = new TH1F(name, title, nxbins, xmin, xmax);
    … …  
    324325
    325326TH1 *ExRootResult::AddHist1D(const char *name, const char *title,
    326                              const char *xlabel, const char *ylabel,
    327                              Int_t nxbins, const Float_t *bins,
    328                              Int_t logx, Int_t logy)
     327  const char *xlabel, const char *ylabel,
     328  Int_t nxbins, const Float_t *bins,
     329  Int_t logx, Int_t logy)
    329330{
    330331  TH1F *hist = new TH1F(name, title, nxbins, bins);
    … …  
    348349
    349350TProfile *ExRootResult::AddProfile(const char *name, const char *title,
    350                                    const char *xlabel, const char *ylabel,
    351                                    Int_t nxbins, Axis_t xmin, Axis_t xmax,
    352                                    Int_t logx, Int_t logy)
     351  const char *xlabel, const char *ylabel,
     352  Int_t nxbins, Axis_t xmin, Axis_t xmax,
     353  Int_t logx, Int_t logy)
    353354{
    354355  TProfile *profile = new TProfile(name, title, nxbins, xmin, xmax);
    … …  
    372373
    373374TH2 *ExRootResult::AddHist2D(const char *name, const char *title,
    374                              const char *xlabel, const char *ylabel,
    375                              Int_t nxbins, Axis_t xmin, Axis_t xmax,
    376                              Int_t nybins, Axis_t ymin, Axis_t ymax,
    377                              Int_t logx, Int_t logy)
     375  const char *xlabel, const char *ylabel,
     376  Int_t nxbins, Axis_t xmin, Axis_t xmax,
     377  Int_t nybins, Axis_t ymin, Axis_t ymax,
     378  Int_t logx, Int_t logy)
    378379{
    379380  TH2F *hist = new TH2F(name, title, nxbins, xmin, xmax, nybins, ymin, ymax);

  • external/ExRootAnalysis/ExRootResult.h

    r45e58be r341014c  
    22#define ExRootResult_h
    33
     4#include "Gtypes.h"
    45#include "Rtypes.h"
    5 #include "Gtypes.h"
    66#include "TMath.h"
    77
     8#include <map>
    89#include <set>
    9 #include <map>
    1010
    1111class TH1;
    … …  
    2323
    2424public:
    25 
    2625  ExRootResult();
    2726  ~ExRootResult();
    … …  
    3231
    3332  TH1 *AddHist1D(const char *name, const char *title,
    34                  const char *xlabel, const char *ylabel,
    35                  Int_t nxbins, Axis_t xmin, Axis_t xmax,
    36                  Int_t logx = 0, Int_t logy = 0);
     33    const char *xlabel, const char *ylabel,
     34    Int_t nxbins, Axis_t xmin, Axis_t xmax,
     35    Int_t logx = 0, Int_t logy = 0);
    3736
    3837  TH1 *AddHist1D(const char *name, const char *title,
    39                  const char *xlabel, const char *ylabel,
    40                  Int_t nxbins, const Float_t *bins,
    41                  Int_t logx = 0, Int_t logy = 0);
     38    const char *xlabel, const char *ylabel,
     39    Int_t nxbins, const Float_t *bins,
     40    Int_t logx = 0, Int_t logy = 0);
    4241
    4342  TProfile *AddProfile(const char *name, const char *title,
    44                        const char *xlabel, const char *ylabel,
    45                        Int_t nxbins, Axis_t xmin, Axis_t xmax,
    46                        Int_t logx = 0, Int_t logy = 0);
     43    const char *xlabel, const char *ylabel,
     44    Int_t nxbins, Axis_t xmin, Axis_t xmax,
     45    Int_t logx = 0, Int_t logy = 0);
    4746
    4847  TH2 *AddHist2D(const char *name, const char *title,
    49                  const char *xlabel, const char *ylabel,
    50                  Int_t nxbins, Axis_t xmin, Axis_t xmax,
    51                  Int_t nybins, Axis_t ymin, Axis_t ymax,
    52                  Int_t logx = 0, Int_t logy = 0);
     48    const char *xlabel, const char *ylabel,
     49    Int_t nxbins, Axis_t xmin, Axis_t xmax,
     50    Int_t nybins, Axis_t ymin, Axis_t ymax,
     51    Int_t logx = 0, Int_t logy = 0);
    5352
    5453  THStack *AddHistStack(const char *name, const char *title);
    … …  
    6261  TCanvas *GetCanvas();
    6362
    64   void PrintPlot(TObject *plot, const char *sufix = "",  const char *format = "eps");
     63  void PrintPlot(TObject *plot, const char *sufix = "", const char *format = "eps");
    6564
    6665  void SetFolder(TFolder *folder) { fFolder = folder; }
    6766
    6867private:
    69 
    7068  struct PlotSettings
    7169  {
    … …  
    7977  TCanvas *fCanvas; //!
    8078
    81   std::set<TObject*> fPool; //!
     79  std::set<TObject *> fPool; //!
    8280
    83   std::map<TObject*, PlotSettings> fPlotMap; //!
     81  std::map<TObject *, PlotSettings> fPlotMap; //!
    8482
    8583  TFolder *fFolder; //!
    86 
    8784};
    8885
    8986#endif /* ExRootResult_h */
    90 

  • external/ExRootAnalysis/ExRootTask.cc

    r45e58be r341014c  
    1111#include "ExRootAnalysis/ExRootConfReader.h"
    1212
    13 #include "TROOT.h"
    1413#include "TClass.h"
    1514#include "TFolder.h"
     15#include "TROOT.h"
    1616#include "TString.h"
    1717
     18#include <iomanip>
    1819#include <iostream>
    19 #include <iomanip>
     20#include <sstream>
    2021#include <stdexcept>
    21 #include <sstream>
    2222
    2323static const char *const kINIT = "0";
    … …  
    144144
    145145  if(!cl) return 0;
    146  
     146
    147147  if(!cl->InheritsFrom(ExRootTask::Class()))
    148148  {
    … …  
    310310  return object;
    311311}
    312 

  • external/ExRootAnalysis/ExRootTask.h

    r45e58be r341014c  
    1717class TFolder;
    1818
    19 class ExRootTask : public TTask
     19class ExRootTask: public TTask
    2020{
    2121public:
    22 
    2322  ExRootTask();
    2423  virtual ~ExRootTask();
    … …  
    4140  ExRootTask *NewTask(const char *className, const char *taskName);
    4241
    43   void Exec(Option_t* option);
     42  void Exec(Option_t *option);
    4443
    4544  int GetInt(const char *name, int defaultValue, int index = -1);
    … …  
    5554
    5655protected:
    57 
    5856  TFolder *GetFolder() const { return fFolder; }
    5957  ExRootConfReader *GetConfReader() const { return fConfReader; }
    … …  
    6361
    6462private:
    65 
    6663  TFolder *fFolder; //!
    6764  ExRootConfReader *fConfReader; //!
    … …  
    7168
    7269#endif /* ExRootTask */
    73 

  • external/ExRootAnalysis/ExRootTreeBranch.cc

    r45e58be r341014c  
    1111#include "ExRootAnalysis/ExRootTreeBranch.h"
    1212
     13#include "TClonesArray.h"
    1314#include "TFile.h"
     15#include "TString.h"
    1416#include "TTree.h"
    15 #include "TString.h"
    16 #include "TClonesArray.h"
    1717
    1818#include <iostream>
     19#include <sstream>
    1920#include <stdexcept>
    20 #include <sstream>
    2121
    2222using namespace std;
    … …  
    2828{
    2929  stringstream message;
    30 //  cl->IgnoreTObjectStreamer();
    31 //  cl->BypassStreamer();
     30  //  cl->IgnoreTObjectStreamer();
     31  //  cl->BypassStreamer();
    3232  fData = new TClonesArray(cl, fCapacity);
    3333
    … …  
    6565  if(fSize >= fCapacity)
    6666  {
    67     if(fCapacity < 10) fCapacity = 10;
    68     else if(fCapacity < 30) fCapacity = 30;
    69     else if(fCapacity < 100) fCapacity = 100;
    70     else if(fCapacity < 250) fCapacity = 250;
    71     else fCapacity *= 2;
     67    if(fCapacity < 10)
     68      fCapacity = 10;
     69    else if(fCapacity < 30)
     70      fCapacity = 30;
     71    else if(fCapacity < 100)
     72      fCapacity = 100;
     73    else if(fCapacity < 250)
     74      fCapacity = 250;
     75    else
     76      fCapacity *= 2;
    7277
    7378    fData->ExpandCreateFast(fCapacity);
    … …  
    7681    fData->ExpandCreateFast(fSize);
    7782  }
    78  
     83
    7984  return fData->AddrAt(fSize++);
    8085}
    … …  
    8994
    9095//------------------------------------------------------------------------------
    91 

  • external/ExRootAnalysis/ExRootTreeBranch.h

    r45e58be r341014c  
    1919{
    2020public:
    21 
    2221  ExRootTreeBranch(const char *name, TClass *cl, TTree *tree = 0);
    2322  ~ExRootTreeBranch();
    … …  
    2726
    2827private:
    29 
    3028  Int_t fSize, fCapacity; //!
    3129  TClonesArray *fData; //!
    … …  
    3331
    3432#endif /* ExRootTreeBranch */
    35 

  • external/ExRootAnalysis/ExRootTreeReader.cc

    r45e58be r341014c  
    1010#include "ExRootAnalysis/ExRootTreeReader.h"
    1111
     12#include "TBranchElement.h"
     13#include "TCanvas.h"
     14#include "TClonesArray.h"
    1215#include "TH2.h"
    1316#include "TStyle.h"
    14 #include "TCanvas.h"
    15 #include "TClonesArray.h"
    16 #include "TBranchElement.h"
    1717
    1818#include <iostream>
    … …  
    5151  if(fChain->IsA() == TChain::Class())
    5252  {
    53     TChain *chain = static_cast<TChain*>(fChain);
     53    TChain *chain = static_cast<TChain *>(fChain);
    5454    if(chain->GetTreeNumber() != fCurrentTree)
    5555    {
    … …  
    9494      if(branch->IsA() == TBranchElement::Class())
    9595      {
    96         TBranchElement *element = static_cast<TBranchElement*>(branch);
     96        TBranchElement *element = static_cast<TBranchElement *>(branch);
    9797        const char *className = element->GetClonesName();
    9898        Int_t size = element->GetMaximum();
    … …  
    145145
    146146//------------------------------------------------------------------------------
    147 

  • external/ExRootAnalysis/ExRootTreeReader.h

    r45e58be r341014c  
    1010 */
    1111
    12 #include "TROOT.h"
    13 #include "TNamed.h"
    1412#include "TChain.h"
    1513#include "TFile.h"
     14#include "TNamed.h"
     15#include "TROOT.h"
    1616
    1717#include <map>
    1818
    19 class ExRootTreeReader : public TNamed
     19class ExRootTreeReader: public TNamed
    2020{
    21 public :
    22 
     21public:
    2322  ExRootTreeReader(TTree *tree = 0);
    2423  ~ExRootTreeReader();
    … …  
    3231
    3332private:
    34 
    3533  Bool_t Notify();
    3634
    … …  
    3836  Int_t fCurrentTree; //! current Tree number in a TChain
    3937
    40   typedef std::map<TString, std::pair<TBranch*, TClonesArray*> > TBranchMap;
     38  typedef std::map<TString, std::pair<TBranch *, TClonesArray *>> TBranchMap;
    4139
    4240  TBranchMap fBranchMap; //!

  • external/ExRootAnalysis/ExRootTreeWriter.cc

    r45e58be r341014c  
    1111#include "ExRootAnalysis/ExRootTreeBranch.h"
    1212
     13#include "TClonesArray.h"
     14#include "TFile.h"
    1315#include "TROOT.h"
    14 #include "TFile.h"
    1516#include "TTree.h"
    16 #include "TClonesArray.h"
    1717
    1818#include <iostream>
     19#include <sstream>
    1920#include <stdexcept>
    20 #include <sstream>
    2121
    2222using namespace std;
    … …  
    3131ExRootTreeWriter::~ExRootTreeWriter()
    3232{
    33   set<ExRootTreeBranch*>::iterator itBranches;
     33  set<ExRootTreeBranch *>::iterator itBranches;
    3434  for(itBranches = fBranches.begin(); itBranches != fBranches.end(); ++itBranches)
    3535  {
    36     delete (*itBranches);
     36    delete(*itBranches);
    3737  }
    3838
    … …  
    6969void ExRootTreeWriter::Clear()
    7070{
    71   set<ExRootTreeBranch*>::iterator itBranches;
     71  set<ExRootTreeBranch *>::iterator itBranches;
    7272  for(itBranches = fBranches.begin(); itBranches != fBranches.end(); ++itBranches)
    7373  {
    … …  
    9595
    9696  tree->SetDirectory(fFile);
    97   tree->SetAutoSave(10000000);  // autosave when 10 MB written
     97  tree->SetAutoSave(10000000); // autosave when 10 MB written
    9898
    9999  return tree;

  • external/ExRootAnalysis/ExRootTreeWriter.h

    r45e58be r341014c  
    1919class ExRootTreeBranch;
    2020
    21 class ExRootTreeWriter : public TNamed
     21class ExRootTreeWriter: public TNamed
    2222{
    2323public:
    24 
    2524  ExRootTreeWriter(TFile *file = 0, const char *treeName = "Analysis");
    2625  ~ExRootTreeWriter();
    … …  
    3635
    3736private:
    38 
    3937  TTree *NewTree();
    4038
    … …  
    4442  TString fTreeName; //!
    4543
    46   std::set<ExRootTreeBranch*> fBranches; //!
     44  std::set<ExRootTreeBranch *> fBranches; //!
    4745
    4846  ClassDef(ExRootTreeWriter, 1)
    … …  
    5048
    5149#endif /* ExRootTreeWriter */
    52 

  • external/ExRootAnalysis/ExRootUtilities.cc

    r45e58be r341014c  
    1010#include "ExRootAnalysis/ExRootUtilities.h"
    1111
     12#include "TChain.h"
     13#include "TH1.h"
    1214#include "TROOT.h"
    13 #include "TH1.h"
    14 #include "TChain.h"
    1515
     16#include <fstream>
    1617#include <iostream>
    17 #include <fstream>
    1818
    1919using namespace std;
    … …  
    7474
    7575//------------------------------------------------------------------------------
    76 
Note: See TracChangeset for help on using the changeset viewer.