initialized diphoton_id

Can someone tell me why this can't be automatically merged?  My master and h2gglobe/master are identical.  This is a branch from my master.