Removed all calibrations from coinc and fine-tuned the Makefile