Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 5275)
+++ trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 5290)
@@ -21,7 +21,7 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.76 $
+// $Revision: 1.77 $
 // $Author: moralejo $ 
-// $Date: 2004-10-14 16:56:43 $
+// $Date: 2004-10-19 10:35:05 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -765,7 +765,9 @@
       factorqe_NSB[ict]=EMI_NSB;
     else if(strstr(qe_filename, "qe-intevac_hpd.RFL.dat") != 0)
-      factorqe_NSB[ict]=HPD_NSB;
+      factorqe_NSB[ict]=HPD_INTEVAC_NSB;
+    else if(strstr(qe_filename, "qe-hamamatsu_hpd.RFL.dat") != 0)
+      factorqe_NSB[ict]=HPD_HAMAMATSU_NSB;
     else{
-      log(SIGNATURE,"WARNING : the factor for the diffuse NSB for this QE file (%s) is not known. The number of phe(ns stated in the inputcard will be used.\n",qe_filename); 
+      log(SIGNATURE,"\n\nWARNING!! : the factor for the diffuse NSB for this QE file (%s) is not known to the camera simulation. The number of phe(ns stated in the inputcard will be used.\n\n",qe_filename); 
       factorqe_NSB[ict]=1.0;
     }
@@ -4882,4 +4884,10 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.76  2004/10/14 16:56:43  moralejo
+//
+// - Added calibration_run option to produce calibration MC files.
+//
+// - Added jitter of pulse position +- 0.5 slices due to FADC clock noise.
+//
 // Revision 1.75  2004/10/14 12:55:02  moralejo
 // *** empty log message ***
Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.h
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/camera.h	(revision 5275)
+++ trunk/MagicSoft/Simulation/Detector/Camera/camera.h	(revision 5290)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: camera.h,v $
-//= $Revision: 1.23 $
+//= $Revision: 1.24 $
 //= $Author: moralejo $ 
-//= $Date: 2004-10-13 17:05:05 $
+//= $Date: 2004-10-19 10:35:05 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -108,5 +108,6 @@
 #define EMI_NSB 0.78
 #define EMICOAT_NSB 1.0
-#define HPD_NSB 2.70
+#define HPD_INTEVAC_NSB 2.70
+#define HPD_HAMAMATSU_NSB 2.85
 
 #define SLICES            19
@@ -367,4 +368,7 @@
 /*
  *$Log: not supported by cvs2svn $
+ *Revision 1.23  2004/10/13 17:05:05  moralejo
+ **** empty log message ***
+ *
  *Revision 1.22  2004/09/17 14:48:21  moralejo
  *