Merge pull request #88 from rest-for-physics/glorialuzon-patch-1

minor update due to updated base class
rest-for-physics · Nov 30, 2022 · 93a11dd · 93a11dd
2 parents 51ae0af + f473a44
commit 93a11dd
Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/inc/TRestRawMultiCoBoAsAdToSignalProcess.h b/inc/TRestRawMultiCoBoAsAdToSignalProcess.h
@@ -115,7 +115,7 @@ class TRestRawMultiCoBoAsAdToSignalProcess : public TRestRawToSignalProcess {
    public:
     void InitProcess() override;
 
-    Bool_t AddInputFile(std::string file) override;
+    Bool_t AddInputFile(const std::string& file) override;
 
     void Initialize() override;
 

diff --git a/inc/TRestRawToSignalProcess.h b/inc/TRestRawToSignalProcess.h
@@ -70,8 +70,8 @@ class TRestRawToSignalProcess : public TRestEventProcess {
 
     void LoadConfig(const std::string& configFilename, const std::string& name = "");
 
-    Bool_t OpenInputFiles(std::vector<std::string> files) override;
-    Bool_t AddInputFile(std::string file) override;
+    Bool_t OpenInputFiles(const std::vector<std::string>& files) override;
+    Bool_t AddInputFile(const std::string& file) override;
     Bool_t ResetEntry() override;
 
     Long64_t GetTotalBytesRead() const override { return totalBytesReaded; }

diff --git a/src/TRestRawMultiCoBoAsAdToSignalProcess.cxx b/src/TRestRawMultiCoBoAsAdToSignalProcess.cxx
@@ -139,7 +139,7 @@ void TRestRawMultiCoBoAsAdToSignalProcess::InitProcess() {
     totalBytesReaded = 0;
 }
 
-Bool_t TRestRawMultiCoBoAsAdToSignalProcess::AddInputFile(string file) {
+Bool_t TRestRawMultiCoBoAsAdToSignalProcess::AddInputFile(const string& file) {
     if (file.find(".graw") == -1) {
         return false;
     }
@@ -302,7 +302,8 @@ bool TRestRawMultiCoBoAsAdToSignalProcess::FillBuffer() {
                 cout << "TRestRawMultiCoBoAsAdToSignalProcess: retrieving frame header in "
                         "file "
                      << i << " (" << fInputFileNames[i] << ")" << endl;
-                if (GetVerboseLevel() >= TRestStringOutput::REST_Verbose_Level::REST_Extreme) fHeaderFrame[i].Show();
+                if (GetVerboseLevel() >= TRestStringOutput::REST_Verbose_Level::REST_Extreme)
+                    fHeaderFrame[i].Show();
             }
 
             // reading data according to the header
@@ -336,7 +337,8 @@ bool TRestRawMultiCoBoAsAdToSignalProcess::FillBuffer() {
             }
             totalBytesReaded += 256;
             if (!ReadFrameHeader(fHeaderFrame[i])) {
-                RESTWarning << "Event " << fCurrentEvent << " : error when reading next frame header" << RESTendl;
+                RESTWarning << "Event " << fCurrentEvent << " : error when reading next frame header"
+                            << RESTendl;
                 RESTWarning << "in file " << i << " \"" << fInputFileNames[i] << "\"" << RESTendl;
                 if (fVerboseLevel > TRestStringOutput::REST_Verbose_Level::REST_Info) fHeaderFrame[i].Show();
                 RESTWarning << "trying to skip this event and find next header..." << RESTendl;
@@ -353,9 +355,10 @@ bool TRestRawMultiCoBoAsAdToSignalProcess::FillBuffer() {
                     totalBytesReaded += 256;
                     if (ReadFrameHeader(fHeaderFrame[i])) {
                         fVerboseLevel = tmp;
-                        RESTWarning << "Successfully found next header (EventId : " << fHeaderFrame[i].eventIdx
-                                << ")" << RESTendl;
-                        if (fVerboseLevel > TRestStringOutput::REST_Verbose_Level::REST_Info) fHeaderFrame[i].Show();
+                        RESTWarning << "Successfully found next header (EventId : "
+                                    << fHeaderFrame[i].eventIdx << ")" << RESTendl;
+                        if (fVerboseLevel > TRestStringOutput::REST_Verbose_Level::REST_Info)
+                            fHeaderFrame[i].Show();
                         cout << endl;
                         // GetChar();
                         found = true;

diff --git a/src/TRestRawToSignalProcess.cxx b/src/TRestRawToSignalProcess.cxx
@@ -134,15 +134,15 @@ void TRestRawToSignalProcess::LoadDefaultConfig() {
     fMinPoints = 512;
 }
 
-Bool_t TRestRawToSignalProcess::OpenInputFiles(vector<string> files) {
+Bool_t TRestRawToSignalProcess::OpenInputFiles(const vector<string>& files) {
     nFiles = 0;
     fInputFiles.clear();
     fInputFileNames.clear();
     totalBytes = 0;
     totalBytesReaded = 0;
 
-    for (int i = 0; i < files.size(); i++) {
-        AddInputFile(files[i]);
+    for (const auto& file : files) {
+        AddInputFile(file);
     }
 
     if (nFiles > 0) {
@@ -156,9 +156,9 @@ Bool_t TRestRawToSignalProcess::OpenInputFiles(vector<string> files) {
     return nFiles;
 }
 
-Bool_t TRestRawToSignalProcess::AddInputFile(string file) {
-    for (int i = 0; i < fInputFileNames.size(); i++) {
-        if (fInputFileNames[i] == file) {
+Bool_t TRestRawToSignalProcess::AddInputFile(const string& file) {
+    for (auto& fInputFileName : fInputFileNames) {
+        if (fInputFileName == file) {
             RESTError << "file: \"" << file << "\" already added!" << RESTendl;
             return false;
         }
@@ -220,8 +220,8 @@ Bool_t TRestRawToSignalProcess::GoToNextFile() {
             fclose(fInputBinFile);
             fInputBinFile = fopen(fInputFileNames[iCurFile].c_str(), "rb");
         }
-        RESTInfo << "GoToNextFile(): Going to the next raw input file number " << iCurFile << " over " << nFiles
-             << RESTendl;
+        RESTInfo << "GoToNextFile(): Going to the next raw input file number " << iCurFile << " over "
+                 << nFiles << RESTendl;
         RESTInfo << "                Reading file name:  " << fInputFileNames[iCurFile] << RESTendl;
         return true;
     } else {