Changeset 7692efc in git for external/Hector

Timestamp:

Aug 16, 2019, 11:14:50 AM (5 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, master

Children:

0e7d64a

Parents:

94f8f5f (diff), 270bd4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

File:

• external/Hector/H_Beam.h (modified) (1 diff)

external/Hector/H_Beam.h

@@ -107 +107 @@
         //@{
                 inline const float getEmittanceX() const {
-                    if(!x_disp*tx_disp) cout<<"Warning : Degenerate Beam : x-emittance = 0"<<endl;      
+                    if(x_disp * tx_disp == 0) cout<<"Warning : Degenerate Beam : x-emittance = 0"<<endl;        
                         return x_disp * tan(tx_disp/URAD)/URAD;
                 }
         inline const float getEmittanceY() const { 
-                        if(!y_disp*ty_disp) cout<<"Warning : Degenerate Beam : y-emittance = 0"<<endl;
+                    if(y_disp * ty_disp == 0) cout<<"Warning : Degenerate Beam : y-emittance = 0"<<endl;
                         return y_disp * tan(ty_disp/URAD)/URAD;
                 }