Ripped in 30

Before I got my HRM I always logged it in as circuit training.

I'd say create a new log for when you do Ripped in 30.

Sites like the following allow a more accurate calculator based on weight concerning how many cals you may be burning:
http://www.healthstatus.com/calculate/cbc

I think it depends on the workout. I'm doing Workout #2 right now and logging it as vigorous calisthenics, because that's what it seems to be to me. But you'll probably get a similar calorie count logging it as circuit training.