Changeset 781


Ignore:
Timestamp:
May 8, 2001, 9:07:54 AM (20 years ago)
Author:
blanch
Message:
New numbering for branches from different trigger conditions has been
implemented. Now, they are calles: ClassName;1., ClasNema;2., ...
The MontaCarlo Headers (MMcTrigHeader and MMcFadcHeader) have been move to
the RunHeaders tree. Also the MRawRunHeader is thera with some of its
information already filled.
File:
1 edited

Legend:

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

    r723 r781  
    2121//
    2222// $RCSfile: camera.cxx,v $
    23 // $Revision: 1.24 $
    24 // $Author: magicsol $
    25 // $Date: 2001-04-06 16:48:09 $
     23// $Revision: 1.25 $
     24// $Author: blanch $
     25// $Date: 2001-05-08 08:07:54 $
    2626//
    2727////////////////////////////////////////////////////////////////////////
     
    6363#include "MLons.hxx"
    6464
     65#include "MRawRunHeader.h"
    6566#include "MRawEvtData.h"
    6667#include "MRawEvtHeader.h"
     
    784785  // Prepare the raw data output
    785786
     787       // Header Tree
     788
     789  MRawRunHeader **RunHeader;
     790
     791  RunHeader = new MRawRunHeader * [1];
     792  RunHeader[0] = new MRawRunHeader();
     793
    786794       // Header branch
    787795
     
    819827
    820828  //      create a Tree for the Header Event
    821   TTree HeaderTree("McHeaders","Monte Carlo Header of Run");
     829  TTree HeaderTree("RunHeaders","Headers of Run");
    822830 
    823831  //      define branches of Header Tree
    824832
    825833  char help[4]; 
     834
     835  HeaderTree.Branch("MRawRunHeader","MRawRunHeader",
     836                    &RunHeader[0], bsize, split);
    826837
    827838  if(!Trigger_Loop && Write_McTrig){
     
    834845     
    835846      sprintf(help,"%i",i+1);
    836       strcpy (branchname, "MMcTrigHeader");
     847      strcpy (branchname, "MMcTrigHeader;");
    837848      strcat (branchname, & help[0]);
    838849      strcat (branchname, ".");
     
    851862     
    852863      sprintf(help,"%i",i+1);
    853       strcpy (branchname, "MMcFadcHeader");
     864      strcpy (branchname, "MMcFadcHeader;");
    854865      strcat (branchname, & help[0]);
    855866      strcat (branchname, ".");
     
    858869    }
    859870  } 
     871
     872  //  Fill branches for MRawRunHeader
     873
     874  RunHeader[0]->SetMagicNumber(kMagicNumber);
     875  RunHeader[0]->SetFormatVersion(2);
     876  RunHeader[0]->SetSoftVersion((UShort_t) (VERSION*10));
     877  RunHeader[0]->SetRunType(256);
     878  RunHeader[0]->SetRunNumber(0);
     879  RunHeader[0]->SetNumSamples(0,FADC_SLICES);
     880
    860881
    861882  //  Fill branches for MMcTrigHeader
     
    957978     
    958979        sprintf(help,"%i",i+1);
    959         strcpy (branchname, "MMcTrig");
     980        strcpy (branchname, "MMcTrig;");
    960981        strcat (branchname, & help[0]);
    961982        strcat (branchname, ".");
     
    970991     
    971992      sprintf(help,"%i",i+1);
    972       strcpy (branchname, "MRawEvtHeader");
     993      strcpy (branchname, "MRawEvtHeader;");
    973994      strcat (branchname, & help[0]);
    974995      strcat (branchname, ".");
     
    9791000     
    9801001      sprintf(help,"%i",i+1);
    981       strcpy (branchname, "MRawEvtData");
     1002      strcpy (branchname, "MRawEvtData;");
    9821003      strcat (branchname, & help[0]);
    9831004      strcat (branchname, ".");
     
    32173238//
    32183239// $Log: not supported by cvs2svn $
     3240// Revision 1.24  2001/04/06 16:48:09  magicsol
     3241// New camera version able to read the new format of the reflector output:
     3242// reflector 0.4
     3243//
    32193244// Revision 1.23  2001/03/28 16:13:41  blanch
    32203245// While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
     
    32693294//
    32703295// $Log: not supported by cvs2svn $
     3296// Revision 1.24  2001/04/06 16:48:09  magicsol
     3297// New camera version able to read the new format of the reflector output:
     3298// reflector 0.4
     3299//
    32713300// Revision 1.23  2001/03/28 16:13:41  blanch
    32723301// While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
Note: See TracChangeset for help on using the changeset viewer.