From 5bbcb37370a20805ec20dedd2fec799b12a450f7 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Sat, 6 Jun 2026 15:45:24 +0200 Subject: [PATCH] PMusrCanvas: replace TObjArray/TObjString with PStringUtils Co-Authored-By: Claude Opus 4.8 --- src/classes/PMusrCanvas.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp index 0f3e465d1..58a6ab1dc 100644 --- a/src/classes/PMusrCanvas.cpp +++ b/src/classes/PMusrCanvas.cpp @@ -34,11 +34,11 @@ #include #include #include -#include #include #include "PMusrCanvas.h" #include "PFourier.h" +#include "PStringUtils.h" static const char *gFiletypes[] = { "Data files", "*.dat", "All files", "*", @@ -6408,23 +6408,15 @@ Bool_t PMusrCanvas::IsScaleN0AndBkg() PMsrLines *cmd = fMsrHandler->GetMsrCommands(); for (UInt_t i=0; isize(); i++) { if (cmd->at(i).fLine.Contains("SCALE_N0_BKG", TString::kIgnoreCase)) { - TObjArray *tokens = nullptr; - TObjString *ostr = nullptr; - TString str; - tokens = cmd->at(i).fLine.Tokenize(" \t"); - if (tokens->GetEntries() != 2) { + std::vector tokens = PStringUtils::Split(cmd->at(i).fLine.Data(), " \t"); + if (tokens.size() != 2) { std::cerr << std::endl << ">> PRunSingleHisto::IsScaleN0AndBkg(): **WARNING** Found uncorrect 'SCALE_N0_BKG' command, will ignore it."; std::cerr << std::endl << ">> Allowed commands: SCALE_N0_BKG TRUE | FALSE" << std::endl; return willScale; } - ostr = dynamic_cast(tokens->At(1)); - str = ostr->GetString(); - if (!str.CompareTo("FALSE", TString::kIgnoreCase)) { + if (PStringUtils::IsEqualNoCase(tokens[1], "FALSE")) { willScale = false; } - // clean up - if (tokens) - delete tokens; } }