Ignore:
Timestamp:
03/15/02 15:15:52 (23 years ago)
Author:
blanch
Message:
Several modifications to simulate the actual trigger zone.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

    r1239 r1252  
    2121//
    2222// $RCSfile: camera.cxx,v $
    23 // $Revision: 1.34 $
     23// $Revision: 1.35 $
    2424// $Author: blanch $
    25 // $Date: 2002-03-13 18:13:56 $
     25// $Date: 2002-03-15 15:15:52 $
    2626//
    2727////////////////////////////////////////////////////////////////////////
     
    248248
    249249//@: Trigger conditions for a single trigger mode
    250 static float qThreshold[TRIGGER_PIXELS]; 
     250static float qThreshold[CAMERA_PIXELS]; 
    251251static int Trigger_multiplicity = 4;
    252252static int Trigger_topology = 2;
     
    449449  Float_t nsb_fadcresp[(Int_t) SLICES_MFADC];   //@< array to write the fadc
    450450                                                //@< response from the database
    451   Byte_t trigger_map[((Int_t)(TRIGGER_PIXELS/8))+1];//@< Pixels on when the
     451  Byte_t trigger_map[((Int_t)(CAMERA_PIXELS/8))+1]; //@< Pixels on when the
    452452                                                    //@< camera triggers
    453453  Float_t fadc_elecnoise[CAMERA_PIXELS];  //@< Electronic niose for each pixel
     
    480480  UShort_t numPix;            //@< number of sets of fadc written counts
    481481
    482   float fpixelthres[TRIGGER_PIXELS];         //@< Threshold values
     482  float fpixelthres[CAMERA_PIXELS];         //@< Threshold values
    483483
    484484  TArrayC *fadcValues;  //@< the analog Fadc signal for pixels
     
    780780  // initialise instance of Trigger and FADC classes
    781781
    782   MTrigger  Trigger(Trigger_gate_length, Trigger_overlaping_time,
    783                     Trigger_response_ampl, Trigger_response_fwhm);  //@< A instance of the Class MTrigger
     782  MTrigger  Trigger(Trigger_gate_length,
     783                    Trigger_overlaping_time,
     784                    Trigger_response_ampl,
     785                    Trigger_response_fwhm);  //@< A instance of the Class MTrigger
     786
     787  // Set Right Discriminator threshold, taking into account trigger pixels
     788
     789  Trigger.CheckThreshold(&qThreshold[0]);
     790
    784791
    785792  //  Initialise McTrig information class if we want to save trigger informtion
     
    955962          HeaderTrig[iconcount]->SetTopology((Short_t) isorttopo[itopocount+Trigger_loop_ltop]);
    956963          HeaderTrig[iconcount]->SetMultiplicity((Short_t) imulticount+Trigger_loop_lmult);
    957           for(int i=0;i<TRIGGER_PIXELS;i++){
     964          for(int i=0;i<CAMERA_PIXELS;i++){
    958965            fpixelthres[i]=
    959966              ((Float_t)(fthrescount)>=qThreshold[i])?
     
    14301437          int iconcount;
    14311438          for (iconcount=0, ithrescount=0, fthrescount=Trigger_loop_lthres;fthrescount<=Trigger_loop_uthres;ithrescount++, fthrescount+=Trigger_loop_sthres){
    1432             for (i=0;i<TRIGGER_PIXELS;i++)
     1439            for (i=0;i<CAMERA_PIXELS;i++)
    14331440              fpixelthres[i]=
    14341441                ((Float_t)(fthrescount)>=qThreshold[i])?
     
    15791586          Trigger.SetMultiplicity(Trigger_multiplicity);
    15801587          Trigger.SetTopology(Trigger_topology);
    1581           for (int i=0;i<TRIGGER_PIXELS;i++)
     1588          for (int i=0;i<CAMERA_PIXELS;i++)
    15821589            fpixelthres[i]=qThreshold[i];
    15831590          Trigger.SetThreshold(fpixelthres);
     
    33693376//
    33703377// $Log: not supported by cvs2svn $
     3378// Revision 1.34  2002/03/13 18:13:56  blanch
     3379// Some changes to fill correctly the new format of MMcRunHeader.
     3380//
    33713381// Revision 1.33  2002/03/04 17:21:48  blanch
    33723382// Small and not important changes.
     
    34723482//
    34733483// $Log: not supported by cvs2svn $
     3484// Revision 1.34  2002/03/13 18:13:56  blanch
     3485// Some changes to fill correctly the new format of MMcRunHeader.
     3486//
    34743487// Revision 1.33  2002/03/04 17:21:48  blanch
    34753488// Small and not important changes.
Note: See TracChangeset for help on using the changeset viewer.