Ignore:
Timestamp:
12/12/02 17:41:13 (22 years ago)
Author:
blanch
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Simulation/Detector/Camera
Files:
2 edited

Legend:

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

    r1674 r1684  
    2121//
    2222// $RCSfile: camera.cxx,v $
    23 // $Revision: 1.47 $
     23// $Revision: 1.48 $
    2424// $Author: blanch $
    25 // $Date: 2002-12-10 17:19:31 $
     25// $Date: 2002-12-12 17:40:50 $
    2626//
    2727////////////////////////////////////////////////////////////////////////
     
    7070#include "MMcTrig.hxx"
    7171#include "MMcRunHeader.hxx"
     72#include "MMcConfigRunHeader.h"
     73#include "MMcCorsikaRunHeader.h"
    7274#include "MMcTrigHeader.hxx"
    7375#include "MMcFadcHeader.hxx"
     
    799801  // Set Right Discriminator threshold, taking into account trigger pixels
    800802
     803
    801804  Trigger.CheckThreshold(&qThreshold[0]);
    802805
     
    860863  MRawRunHeader *RunHeader= new MRawRunHeader();
    861864  MMcRunHeader  *McRunHeader = new MMcRunHeader();
     865  MMcConfigRunHeader  *McConfigRunHeader = new MMcConfigRunHeader();
     866  MMcCorsikaRunHeader  *McCorsikaRunHeader = new MMcCorsikaRunHeader();
    862867
    863868       // Header branch
     
    907912  HeaderTree.Branch("MMcRunHeader","MMcRunHeader",
    908913                    &McRunHeader);
     914
     915  HeaderTree.Branch("MMcConfigRunHeader","MMcConfigRunHeader",
     916                    &McConfigRunHeader);
     917
     918  HeaderTree.Branch("MMcCorsikaRunHeader","MMcCorsikaRunHeader",
     919                    &McCorsikaRunHeader);
    909920
    910921  if(!Trigger_Loop && Write_McTrig){
     
    19351946          still_in_loop  = FALSE;
    19361947          log(SIGNATURE, "Reading ASCII files at the end of the reflector file.  . .\n");
    1937           read_ascii(inputfile);
    1938           break;
     1948          read_ascii(inputfile, McConfigRunHeader);
     1949          //break;
    19391950          if ((! Data_From_STDIN) && ( !feof(inputfile) )){
    19401951           
     
    28322843//!@{
    28332844void
    2834 read_ascii(FILE *sp)
     2845read_ascii(FILE *sp, MMcConfigRunHeader *config)
    28352846{
     2847  Float_t radius = -1.0;
     2848  Float_t focal = -1.0;
     2849  Float_t stdfocal = -1.0;
     2850  Float_t point = -1.0;
     2851  Float_t stdpoint = -1.0;
     2852  Float_t adjust = -1.0;
     2853  Float_t spot = -1.0;
     2854  Float_t camwidth = -1.0;
     2855
     2856  Char_t token[40];
     2857  Char_t line[511];
     2858  Char_t flag;
    28362859  cout<<"To be implemented..."<<endl;
     2860  while(1){
     2861    if((flag=fgetc(sp))==EOF)
     2862      break;
     2863    fgets(&line[1],500,sp);
     2864    line[0]=flag;
     2865    if (line[0]== '#')
     2866      continue;
     2867    if (strstr(line, "type") == line)
     2868      continue;
     2869    if (strstr(line, "focal_distance") == line)
     2870      sscanf(line,"%s %f",token,&focal);
     2871      continue;
     2872    if (strstr(line, "focal_std") == line)
     2873      continue;
     2874    if (strstr(line, "point_spread") == line)
     2875      continue;
     2876    if (strstr(line, "point_std") == line)
     2877      continue;
     2878    if (strstr(line, "adjustment_dev") == line)
     2879      continue;
     2880    if (strstr(line, "black_spot") == line)
     2881      continue;
     2882    if (strstr(line, "camera_width") == line)
     2883      continue;
     2884    if (strstr(line, "n_pixels") == line)
     2885      continue;
     2886    if (strstr(line, "pixel_width") == line)
     2887      continue;
     2888    if (strstr(line, "n_centralpixels") == line)
     2889      continue;
     2890    if (strstr(line, "n_gappixels") == line)
     2891      continue;
     2892    if (strstr(line, "n_mirrors") == line)
     2893      continue;
     2894    if (strstr(line, "r_mirror") == line)
     2895      continue;
     2896    if (strstr(line, "define_mirrors") == line)
     2897      break;
     2898  }
    28372899}
    28382900
     
    37953857//
    37963858// $Log: not supported by cvs2svn $
     3859// Revision 1.47  2002/12/10 17:19:31  blanch
     3860// *** empty log message ***
     3861//
    37973862// Revision 1.46  2002/11/08 17:51:00  blanch
    37983863// *** empty log message ***
     
    39374002//
    39384003// $Log: not supported by cvs2svn $
     4004// Revision 1.47  2002/12/10 17:19:31  blanch
     4005// *** empty log message ***
     4006//
    39394007// Revision 1.46  2002/11/08 17:51:00  blanch
    39404008// *** empty log message ***
  • trunk/MagicSoft/Simulation/Detector/Camera/camera.h

    r1674 r1684  
    1919//=
    2020//= $RCSfile: camera.h,v $
    21 //= $Revision: 1.13 $
     21//= $Revision: 1.14 $
    2222//= $Author: blanch $
    23 //= $Date: 2002-12-10 17:20:32 $
     23//= $Date: 2002-12-12 17:41:13 $
    2424//=
    2525//=//////////////////////////////////////////////////////////////////////
     
    282282void read_QE(void);
    283283void read_WC(void);
    284 void read_ascii( FILE *sp // the input file
     284void read_ascii( FILE *sp, // the input file
     285                 MMcConfigRunHeader *config
    285286                 );
    286287int pixels_are_neig(int pix1, int pix2);
     
    333334/*
    334335 *$Log: not supported by cvs2svn $
     336 *Revision 1.13  2002/12/10 17:20:32  blanch
     337 **** empty log message ***
     338 *
    335339 *Revision 1.12  2002/10/29 17:16:28  blanch
    336340 *Header file for camera.cxx version 1.45
Note: See TracChangeset for help on using the changeset viewer.