Update CurveBaseMaker.py

Copied some developments from other branch...