Fix missing ROOT version determination

Sorry, there are some another functions that uses RooFormulaVar::expression() but does not take ROOT version into account.

Additional code improvement and bugfix are also implemented here. Note that the output of root-config --version with latest ROOT is of the form X.YY.ZZ (rather than X.YY/ZZ), the root_checker.py is also updated accordingly.

marked this merge request as draft

added 1 commit

• 0fc44b4e - Code improvement and bugfix

Compare with previous version

changed the description

marked this merge request as ready

approved this merge request

added 1 commit

• 4e2e2c00 - Mirror bugfix

Compare with previous version

Thanks @caiyi, the code does look a lot cleaner now. Though I think we could just create two functions to return the formula_str and dependents of a RooFormulaVar. So that we don't need to write the version check every time we need them. Something like

namespace RooFormulaVarExt{
    #if ROOT_VERSION_CODE < ROOT_VERSION(6,26,00)
    inline std::string getFormulaStr(RooFormulaVar& arg){
        return arg.formula().formulaString();
    }
    inline const RooArgSet getDependents(RooFormulaVar& arg){
        return arg.formula().actualDependents();
    }
    #else
    inline std::string getFormulaStr(RooFormulaVar& arg){
        return arg.expression();
    }
    inline const RooArgSet getDependents(RooFormulaVar& arg){
        return arg.dependents();
    }
    #endif
}

assigned to @clcheng

requested review from @clcheng

added 1 commit

• 3b06369b - Add RooFormulaVarExt namespace

Compare with previous version

resolved all threads

Alright I think we are ready to merge!

merged

mentioned in commit a7a89f63