Merge branch '643-remove-unnecessary-condition-in-ccollimators' into 'master'

Resolve "Remove unnecessary condition in CCollimators"

Closes #643

See merge request !483

src/Classic/AbsBeamline/CCollimator.cpp

@@ -82,16 +82,17 @@ bool CCollimator::doCheck(PartBunchBase<double, 3> *bunch, const int turnnumber,
     int pflag = 0;
     // now check each particle in bunch
     for (unsigned int i = 0; i < tempnum; ++i) {
-        if (bunch->POrigin[i] == ParticleOrigin::REGULAR && bunch->R[i](2) < zend_m && bunch->R[i](2) > zstart_m ) {
+        if (bunch->R[i](2) < zend_m && bunch->R[i](2) > zstart_m ) {
             // only now careful check in r
             pflag = checkPoint(bunch->R[i](0), bunch->R[i](1));
             /// bunch->Bin[i] != -1 makes sure the particle is not stored in more than one collimator
             if ((pflag != 0) && (bunch->Bin[i] != -1)) {
-                if (!parmatint_m)
+                if (!parmatint_m) {
                     lossDs_m->addParticle(OpalParticle(bunch->ID[i],
                                                        bunch->R[i], bunch->P[i],
                                                        t, bunch->Q[i], bunch->M[i]),
                                           std::make_pair(turnnumber, bunch->bunchNum[i]));
+                }
                 bunch->Bin[i] = -1;
                 flagNeedUpdate = true;
             }
@@ -148,7 +149,7 @@ void CCollimator::setDimensions(double xstart, double xend, double ystart, doubl
     zend_m   = zend;
     width_m  = width;
     // zstart and zend are independent from x, y
-    if (zstart_m > zend_m){
+    if (zstart_m > zend_m) {
         std::swap(zstart_m, zend_m);
     }
     setGeom(width_m);