Changeset 1224 for trunk/MagicSoft/Simulation/Detector/Camera

Timestamp:

02/28/02 15:07:23 (23 years ago)

Author:

blanch

Message:

Small changes have been done to introduce thes step variable for the
discriminator threshold in the trigger loop mode.

File:

• trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx (modified) (5 diffs)

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

@@ -19 +19 @@
 //=
 //= $RCSfile: creadparam.cxx,v $
-//= $Revision: 1.13 $
+//= $Revision: 1.14 $
 //= $Author: blanch $ 
-//= $Date: 2002-01-18 17:43:08 $
+//= $Date: 2002-02-28 15:07:23 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -118 +118 @@
 static int Trigger_multiplicity = 4;
 static int Trigger_topology = 2;
-static int Trigger_loop_lthres = 0;
-static int Trigger_loop_uthres = 10;
+static float Trigger_loop_lthres = 3.0;
+static float Trigger_loop_uthres = 10.0;
+static float Trigger_loop_sthres = 1.0;
 static int Trigger_loop_lmult = 2;
 static int Trigger_loop_umult = 10;
@@ -485 +486 @@
 
       //  Get loop's limits
-      sscanf(line, "%s %d %d %d %d %d %d", token, &Trigger_loop_lthres, &Trigger_loop_uthres, &Trigger_loop_lmult, &Trigger_loop_umult, &Trigger_loop_ltop, &Trigger_loop_utop );
+      sscanf(line, "%s %f %f %f %d %d %d %d", token, &Trigger_loop_lthres, &Trigger_loop_uthres, &Trigger_loop_sthres, &Trigger_loop_lmult, &Trigger_loop_umult, &Trigger_loop_ltop, &Trigger_loop_utop );
 
       // Set qThreshold to a global value
@@ -1254 +1255 @@
 //!@{
 int
-get_Trigger_Loop(int *lt, int *ut, int *lm, int *um, int *lg, int *ug)
+get_Trigger_Loop(float *lt, float *ut, float *st, int *lm, int *um, int *lg, int *ug)
 {
   *lt=Trigger_loop_lthres;
   *ut=Trigger_loop_uthres;
+  *st=Trigger_loop_sthres;
   *lm=Trigger_loop_lmult;
   *um=Trigger_loop_umult;
@@ -1337 +1339 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.13  2002/01/18 17:43:08  blanch
+// Three new commands have been added: fadc_noise, trig_noise and
+// elec_noise_off.
+// A small bug in the SIGNATURE check has been solved.
+//
 // Revision 1.12  2001/11/13 17:05:14  blanch
 // New input items int the input card parameter list have been included to fill