Merge pull request #2 from ax3l/radiationFilterNamings

merge changes from @ax3l

CHANGELOG.md

@@ -10,11 +10,12 @@ This is the 5th release candidate, a *pre-beta* version.
 ### Changes to "Open Beta RC4"
 
 **.param file changes:**
- - Added selection of optional window functions in `radiationConfig.param` #286
+ - Added selection of optional window functions in `radiationConfig.param`
+  [#286](https://github.com/ComputationalRadiationPhysics/picongpu/pull/286/files#diff-1)
 
 **New Features:**
- - Radiation includes now optional window functions to reduce ringing effects 
-   caused by sharp boundaries. #286
+ - Radiation plugin: add optional window functions to reduce ringing effects
+   caused by sharp boundaries #286
 
 **Bug fixes:**
  - n/a

examples/Bunch/include/simulation_defines/param/radiationConfig.param

@@ -101,7 +101,7 @@ namespace picongpu
   namespace radFormFactor_incoherent { }
 
 
-  namespace radFormFactor_selected = radFormFactor_CIC_3D;
+  namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu                                                                          
@@ -166,7 +166,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu

examples/KelvinHelmholtz/include/simulation_defines/param/radiationConfig.param

@@ -104,7 +104,7 @@ namespace picongpu
   namespace radFormFactor_CIC_1Dy { }
   namespace radFormFactor_incoherent { }
 
-  namespace radFormFactor_selected = radFormFactor_CIC_3D;
+  namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu                                                                          
@@ -173,7 +173,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu

examples/LaserWakefield/include/simulation_defines/param/radiationConfig.param

@@ -110,7 +110,7 @@ namespace picongpu
   namespace radFormFactor_CIC_1Dy { }
   namespace radFormFactor_incoherent { }
 
-  namespace radFormFactor_selected = radFormFactor_CIC_3D;
+  namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu                                                                          
@@ -174,7 +174,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu

examples/SingleParticleCurrent/include/simulation_defines/param/radiationConfig.param

@@ -110,7 +110,7 @@ namespace picongpu
   namespace radFormFactor_CIC_1Dy { }
   namespace radFormFactor_incoherent { }
 
-  namespace radFormFactor_selected = radFormFactor_CIC_3D;
+  namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu                                                                          
@@ -174,7 +174,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu

examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/radiationConfig.param

@@ -101,7 +101,7 @@ namespace picongpu
   namespace radFormFactor_CIC_1Dy { }
   namespace radFormFactor_incoherent { }
 
-  namespace radFormFactor_selected = radFormFactor_CIC_3D;
+  namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu                                                                          
@@ -164,7 +164,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu

examples/SingleParticleTest/include/simulation_defines/param/radiationConfig.param

@@ -104,7 +104,7 @@ namespace picongpu
   namespace radFormFactor_CIC_1Dy { }
   namespace radFormFactor_incoherent { }
 
-  namespace radFormFactor_selected = radFormFactor_CIC_3D;
+  namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu                                                                          
@@ -171,7 +171,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu

src/picongpu/include/plugins/Radiation.hpp

@@ -348,7 +348,7 @@ void kernelRadiationParticles(ParBox pb,
 			     * of the window function filter without needing more memory */
 #if (PIC_RADWINDOWFUNCTION==1)
 
-			    const radWindowFunction_selected::radWindowFunction winFkt;
+			    const radWindowFunction::radWindowFunction winFkt;
 
 			    /* start with a factor of one */
 			    float_X windowFactor = 1.0;
@@ -403,7 +403,7 @@ void kernelRadiationParticles(ParBox pb,
                         // if coherent and incoherent radiation of a single macro-particle 
                         // is considered, creare a form factor object
 #if (__COHERENTINCOHERENTWEIGHTING__==1)
-                        const radFormFactor_selected::radFormFactor myRadFormFactor;
+                        const radFormFactor::radFormFactor myRadFormFactor;
 #endif
 
                         /* Particle loop: thread runs through loaded particle data

src/picongpu/include/plugins/radiation/windowFunctions.hpp

@@ -1,22 +1,22 @@
 /**
  * Copyright 2014 Richard Pausch
  *
- * This file is part of PIConGPU. 
- * 
- * PIConGPU is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 3 of the License, or 
- * (at your option) any later version. 
- * 
- * PIConGPU is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with PIConGPU.  
- * If not, see <http://www.gnu.org/licenses/>. 
- */ 
+ * This file is part of PIConGPU.
+ *
+ * PIConGPU is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PIConGPU is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PIConGPU.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
@@ -48,8 +48,8 @@ namespace picongpu
 	return float_X(math::abs(position_x- L_x)<=float_X(0.5*L_x));
       }
     };
-  } /* end namespace: radWindowFunctionRectangle */
-  
+  } /* namespace radWindowFunctionRectangle */
+
 
 
   namespace radWindowFunctionTriangle
@@ -76,10 +76,8 @@ namespace picongpu
 	return float_X(math::abs(x)<=float_X(0.5*L_x))*(float_X(1.0)-float_X(2.0/L_x) * math::abs(x) );
       }
     };
-  } /* end namespace: radWindowFunctionTriangle */
-
-
+  } /* namespace radWindowFunctionTriangle */
 
-}  /* end namespace: picongpu */
 
 
+}  /* namespace picongpu */

src/picongpu/include/simulation_defines/param/radiationConfig.param

@@ -101,7 +101,7 @@ namespace radFormFactor_CIC_3D { }
 namespace radFormFactor_CIC_1Dy { }
 namespace radFormFactor_incoherent { }
 
-namespace radFormFactor_selected = radFormFactor_CIC_3D;
+namespace radFormFactor = radFormFactor_CIC_3D;
 
 
 }//namespace picongpu
@@ -163,7 +163,7 @@ namespace picongpu
 namespace radWindowFunctionRectangle { }
 namespace radWindowFunctionTriangle { }
 
-namespace radWindowFunction_selected = radWindowFunctionTriangle;
+namespace radWindowFunction = radWindowFunctionTriangle;
 
 
 }//namespace picongpu