Changeset 5418 for trunk/MagicSoft

Timestamp:

11/17/04 11:38:28 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Simulation/Detector

Files:

• Camera/creadparam.cxx (modified) (5 diffs)
• Camera/creadparam.h (modified) (4 diffs)
• StarResponse/starresponse.cxx (modified) (1 diff)
• include-MLons/MLons.cxx (modified) (6 diffs)
• include-MLons/MLons.hxx (modified) (3 diffs)

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

@@ -19 +19 @@
 //=
 //= $RCSfile: creadparam.cxx,v $
-//= $Revision: 1.33 $
+//= $Revision: 1.34 $
 //= $Author: moralejo $ 
-//= $Date: 2004-10-26 13:58:59 $
+//= $Date: 2004-11-17 11:36:07 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -118 +118 @@
 static int   selected_pixel = -1; // Selected pixel: if >= 0 ==> only this pixel is filled! 
 
-static int   gain_fluctuations = 1; // Is 0 if PMT gain fluctuations are disabled
+static int   gain_fluctuations = 1; // Is 0 if PMT gain fluctuations are disabled for signal
+static int   noise_gain_fluctuations = 1; // Is 0 if PMT gain fluctuations are disabled for NSB noise
 
 // Coordinates of CT locations, in centimeters, in the Corsika system.
@@ -629 +630 @@
       break;
 
+    case noise_gain_fluctuations_off:
+
+      noise_gain_fluctuations = 0;
+
+      break;
+
     case end_file:            //@< end of the parameters file
 
@@ -1411 +1418 @@
 }
   
+int apply_noise_gain_fluctuations()
+{
+  return noise_gain_fluctuations;
+}
+  
 
 //=------------------------------------------------------------
@@ -1418 +1430 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.33  2004/10/26 13:58:59  moralejo
+//
+// Added option gain_fluctuations_off
+//
 // Revision 1.32  2004/10/14 16:53:49  moralejo
 //

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

@@ -19 +19 @@
 //=
 //= $RCSfile: creadparam.h,v $
-//= $Revision: 1.29 $
+//= $Revision: 1.30 $
 //= $Author: moralejo $ 
-//= $Date: 2004-10-26 13:58:59 $
+//= $Date: 2004-11-17 11:36:07 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -116 +116 @@
 T(mirror_fraction), /* Fraction of dish mirror really operative */ \
 T(calibration_run), /* option to produce a calibration file */ \
-T(gain_fluctuations_off), /* Switches off PMT gain fluctuations */ \
+T(gain_fluctuations_off), /* Switches off PMT gain fluctuations for signal */ \
+T(noise_gain_fluctuations_off), /* Switches off PMT gain fluctuations for NSB noise */ \
 T(end_file)         /* end of the parameters file */
 
@@ -197 +198 @@
                                  float *sigma_time, int *nevents, int *selected_pixel);
 int   apply_gain_fluctuations();
+int   apply_noise_gain_fluctuations();
 //!@}
 
@@ -212 +214 @@
 /*
  * $Log: not supported by cvs2svn $
+ * Revision 1.29  2004/10/26 13:58:59  moralejo
+ *
+ * Added option gain_fluctuations_off
+ *
  * Revision 1.28  2004/10/13 17:05:05  moralejo
  * *** empty log message ***

trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.cxx

@@ -25 +25 @@
   MStarLight  data(fadc->GetFadcSlicesPerNanosec(), fadc->GetResponseSlicesFadc());
   // create  instance of the MStarLight 
+
+  data.SetGainFluctuations(apply_gain_fluctuations());
 
   //  Shall I write the root file???

trunk/MagicSoft/Simulation/Detector/include-MLons/MLons.cxx

@@ -19 +19 @@
   fFwhmFadc = 2.0;
 
+  fGainFluctuations = 1;
+
   RandomNumber = new TRandom();
   RandomNumber -> SetSeed(0);
@@ -26 +28 @@
 MLons::MLons(Int_t in_shapeT, Float_t in_amplT, Float_t in_FwhmT, 
              Int_t in_shapeF, Float_t in_integF, Float_t in_FwhmF,
-             Float_t in_Fadc_Slices_per_ns)
+             Float_t in_Fadc_Slices_per_ns, Int_t in_Gain_Fluctuations)
 {
   //--------------------------------------------------------------------
@@ -43 +45 @@
   fFadcSlicesPerNanosec = in_Fadc_Slices_per_ns;
 
+  fGainFluctuations = in_Gain_Fluctuations;
+
   MSLStored = new MStarLight;
 
@@ -63 +67 @@
   fIntegFadc   = 0.; 
   fFwhmFadc    = 0.; 
+
+  fGainFluctuations = 1;
 
   MSLStored->Reset();
@@ -221 +227 @@
       strcat(filename_slt, ".slt");
  
-      // If brightness is different it check if the new file has the
+      // If brightness is different it checks if the new file has the
       // required parameters.
       // Note: I could be faster to store the whole trigger and fadc
@@ -236 +242 @@
           return 0;
         }
+
+      if ( !MSLStored->GetGainFluctuations() && fGainFluctuations)
+        {
+          cout << endl << "ERROR! The read NSB database in " << filename_slt << endl;
+          cout << "has been produced without PMT gain fluctuations. This is incompatible" << endl;
+          cout << "with the camera input card you are using. Please change the camera" << endl;
+          cout << "input card (adding the  noise_gain_fluctuations_off  command) or"  << endl;
+          cout << "produce a new NSB database (using program StarResponse) without" << endl;
+          cout << "gain fluctuations. Exiting..." << endl << endl;
+          return 0;
+        }
+
+      else if ( MSLStored->GetGainFluctuations() && !fGainFluctuations)
+        {
+          cout << endl << "ERROR! The read NSB database in " << filename_slt << endl;
+          cout << "has been produced with PMT gain fluctuations. This is incompatible" << endl;
+          cout << "with the camera input card command  noise_gain_fluctuations_off" << endl;
+          cout << "that you are using. Please change the camera input card or produce a" << endl;
+          cout << "new NSB database (using program StarResponse) without gain fluctuations." << endl;
+          cout << "Exiting..." << endl << endl;
+          return 0;
+        }
+
       MSLStored->SetBrightness(in_br);
 

trunk/MagicSoft/Simulation/Detector/include-MLons/MLons.hxx

@@ -57 +57 @@
   Float_t  fFadcSlicesPerNanosec; // The sampling frequency (GHz) of the FADC
 
+  Int_t    fGainFluctuations; // Indicates whether or not  gain fluctuations have
+                              // been simulated for producing the NSB database
+
+
   TRandom  *RandomNumber; // RandomGenerator 
 
@@ -65 +69 @@
   MLons(Int_t in_shapeT, Float_t in_amplT, Float_t in_FwhmT,
         Int_t in_shapeF, Float_t in_integF, Float_t in_FwhmF,
-        Float_t in_Fadc_Slices_per_ns);
+        Float_t in_Fadc_Slices_per_ns, Int_t in_Gain_Fluctuations);
 
   void Reset() ;
@@ -83 +87 @@
   Float_t GetFwhmFadc() ; 
   Float_t GetFadcSlicesPerNanosec() {return fFadcSlicesPerNanosec;}
+  Int_t   GetGainFluctuations() const { return fGainFluctuations; }
+
 
   void GetPath(Char_t *out);