Merge branch 'master' into 'master'

Change in a position of ZDC

See merge request EIC/benchmarks!7

calorimeters/ZDC_example.xml

@@ -31,12 +31,12 @@
     		<constant name="offset_ZDC"    value="5.0*mm"/>
 		<constant name="st_length"     value="20.0*mm"/>
 		<constant name="lt_length"     value="40.0*mm"/>
-		<constant name="st_ZDC_x_pos"  value="0.60*m"/>
+		<constant name="st_ZDC_x_pos"  value="0.0*m"/>   <!-- value="0.60*m"  -->
 		<constant name="st_ZDC_y_pos"  value="0.0*m"/>
-		<constant name="st_ZDC_z_pos"  value="34.0*m"/>
-		<constant name="lt_ZDC_x_pos"  value="0.60*m"/>
+		<constant name="st_ZDC_z_pos"  value="1.0*m"/>   <!-- value="34.0*m"  -->
+		<constant name="lt_ZDC_x_pos"  value="0.0*m"/>   <!-- value="0.60*m"  -->
 		<constant name="lt_ZDC_y_pos"  value="offset_ZDC + (st_length+lt_length)/sqrt(2)"/>
-        	<constant name="lt_ZDC_z_pos"  value="34.0*m"/>
+        	<constant name="lt_ZDC_z_pos"  value="1.0*m"/>  <!-- value="34.0*m"  -->
   	</define>
 
   <limits>

calorimeters/simple_checking.cxx

@@ -108,7 +108,7 @@ std::cout << "testing 3\n";
 std::cout << "testing 4\n";
   auto h0 = d1.Histo1D(TH1D("h0", "nhits; ", 20, 0,20), "nhits");
 
-  auto n0 = d1.Filter([](int n){ return (n>=0); },{"nhits"}).Count();
+  auto n0 = d1.Filter([](int n){ return (n>0); },{"nhits"}).Count();
 
   TCanvas* c = new TCanvas();