Changeset 1704 for trunk/MagicSoft/Simulation

Timestamp:

01/14/03 13:37:47 (22 years ago)

Author:

blanch

Message:

Option to set a dc value to rise the discriminator threshold has been added.

Location:

trunk/MagicSoft/Simulation/Detector/Camera

Files:

• creadparam.cxx (modified) (6 diffs)
• creadparam.h (modified) (4 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx

@@ -19 +19 @@
 //=
 //= $RCSfile: creadparam.cxx,v $
-//= $Revision: 1.17 $
+//= $Revision: 1.18 $
 //= $Author: blanch $ 
-//= $Date: 2002-07-16 16:20:41 $
+//= $Date: 2003-01-14 13:37:47 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -87 +87 @@
 static float qThreshold[CAMERA_PIXELS];     //@< Threshold values
 static int Individual_Thres = FALSE;
+static float RiseDisc = -1.0;
+static float SecureDisc = 7.0;
 static float qTailCut;          //@< Tail Cut value
 static int nIslandsCut;         //@< Islands Cut value
@@ -159 +161 @@
   char token[ITEM_MAX_LENGTH];   //@< a single token
   int i, j, k;                      //@< dummy counters
-  float aux;                    //@< auxiliar variable
+  float aux, aux2;                    //@< auxiliar variable
   ifstream ifile;
 
@@ -336 +338 @@
       break;
 
+    case secure_disc:           //@< value of secure threshold 
+          
+      // get value of secure threshold (in ph.e.)
+      sscanf(line, "%s %f %f", token,&aux, &aux2);
+      RiseDisc=aux;
+      SecureDisc=aux2;
+
+      break;
+
     case tail_cut:            //@< value of tail_cut (t0)
           
@@ -821 +832 @@
 //!@}
 
+//!-----------------------------------------------------------
+// @name get_secure_threhold
+//                                                
+// @desc get values for secure threshold.
+//
+// @return  AC (ac)value above which discriminator threshold rised to disc
+//
+// @date Wed Jul 18 16:29:43 CEST 2001
+//------------------------------------------------------------
+// @function 
+
+//!@{
+void 
+get_secure_threhold(float *ac, float *disc)
+{
+  *ac=RiseDisc;
+  *disc=SecureDisc;
+}
+//!@}
 
 //!-----------------------------------------------------------
@@ -1372 +1402 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.17  2002/07/16 16:20:41  blanch
+// Modifications done for the camera.cxx version, where a first implementation
+// of the Star Field Rotation has been introduced.
+//
 // Revision 1.16  2002/03/15 15:17:18  blanch
 // Several modification needed to simulate the actual trigger zone.

trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h

@@ -19 +19 @@
 //=
 //= $RCSfile: creadparam.h,v $
-//= $Revision: 1.15 $
+//= $Revision: 1.16 $
 //= $Author: blanch $ 
-//= $Date: 2002-07-16 16:20:59 $
+//= $Date: 2003-01-14 13:37:32 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -164 +164 @@
 T(nsb_directory),   /* database for the NSB  */ \
 T(pixel_thres),     /* value of q0 for trigger for a given pixel */ \
+T(secure_disc),     /* Ac value to rise discrimnator threshold */ \
 T(tail_cut),        /* value of tail cut (t0) */ \
 T(islands_on),      /* DO count islands */ \
@@ -268 +269 @@
 void get_Trigger_Single(float *t, int *m, int *g);
 void get_threshold(float *t);
+void get_secure_threhold(float *ac, float *disc);
 int get_indi_thres_pixel(void);
 void get_teles_axis(float *th, float *p);
@@ -287 +289 @@
 /*
  * $Log: not supported by cvs2svn $
+ * Revision 1.15  2002/07/16 16:20:59  blanch
+ * Modifications done for the camera.cxx version, where a first implementation
+ * of the Star Field Rotation has been introduced.
+ *
  * Revision 1.14  2002/03/15 15:17:57  blanch
  * Header file for creadparam.cxx v 1.16