Changeset 3325 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
02/26/04 10:55:25 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3324 r3325  
    1212   * mreport/MReport.cc, mreport/MReportFileRead.cc:
    1313     - introduced return case -1
     14
     15   * Makefile.rules:
     16     - remove all dependancy files when calling 'rmdep'
     17
     18   * mbase/MAGIC.h, mmc/MMcEvt.hxx:
     19     - moved ParticleId_t to MMcEvt
     20     - implemented MMcEvt::GetParticleName
     21     - implemented MMcEvt::GetEnergyStr
     22
     23   * mfilter/MFGeomag.cc, mfilter/MFParticleId.cc, mhist/MHCompProb.cc,
     24     mhist/MHEvent.cc, mhist/MHHadronness.cc,
     25     mmontecarlo/MMcTriggerRateCalc.cc, mranforest/MHRanForest.cc:
     26     - fixed usage of ParticleId_t
     27
     28   * msignal/Makefile:
     29     - removed obsolete includes
    1430
    1531

  • trunk/MagicSoft/Mars/Makefile.rules

    r2858 r3325  
    4848
    4949rmdep: 
    50         @echo " Removing dependency file..."
    51         @rm -f *Dep.d
     50        @echo " Removing dependency files..."
     51        @rm -f *Dep.d */*Dep.d
    5252
    5353rmcore:

  • trunk/MagicSoft/Mars/mbase/MAGIC.h

    r3318 r3325  
    2929
    3030//
    31 //     ParticleId for Monte Carlo simulation
    32 //
    33 typedef enum
    34 {
    35     kGAMMA  =    1,
    36     kPOSITRON =  2,
    37     kELECTRON =  3,
    38     kPROTON =   14,
    39     kHELIUM =  402,
    40     kOXYGEN = 1608,
    41     kIRON   = 5626
    42 } ParticleId_t;
    43 
    44 //
    4531//     ColorId for calibration
    4632//

  • trunk/MagicSoft/Mars/mfilter/MFGeomag.cc

    r2990 r3325  
    3636//
    3737/////////////////////////////////////////////////////////////////////////////
    38 
    3938#include "MFGeomag.h"
    4039
    … …  
    156155    switch (fMcEvt->GetPartId())
    157156    {
    158     case kGAMMA:
     157    case MMcEvt::kGAMMA:
    159158        if (!fGammaElectron)     //accept gammas if not set to electrons
    160159            return kTRUE;
    … …  
    162161        break;
    163162
    164     case kHELIUM:
     163    case MMcEvt::kHELIUM:
    165164        rig /= 2;                //double charge
    166165        break;
    167166
    168     case kPROTON:                //protons
    169     case kPOSITRON:              //positrons
    170         break;
    171 
    172     case kELECTRON:              //electrons
     167    case MMcEvt::kPROTON:                //protons
     168    case MMcEvt::kPOSITRON:              //positrons
     169        break;
     170
     171    case MMcEvt::kELECTRON:              //electrons
    173172        indadd = 1152;           //second part of table (negative particles)
    174173        break;

  • trunk/MagicSoft/Mars/mfilter/MFParticleId.cc

    r2206 r3325  
    140140    switch (fValue)
    141141    {
    142     case kGAMMA:
    143         out << "kGAMMA";
    144         break;
    145     case kPROTON:
    146         out << "kPROTON";
    147         break;
    148     case kHELIUM:
    149         out << "kHELIUM";
    150         break;
    151     case kOXYGEN:
    152         out << "kOXYGEN";
    153         break;
    154     case kIRON:
    155         out << "kIRON";
    156         break;
     142    case MMcEvt::kGAMMA:    out << "MMcEvt::kGAMMA";    break;
     143    case MMcEvt::kPOSITRON: out << "MMcEvt::kPOSITRON"; break;
     144    case MMcEvt::kELECTRON: out << "MMcEvt::kELECTRON"; break;
     145    case MMcEvt::kPROTON:   out << "MMcEvt::kPROTON";   break;
     146    case MMcEvt::kHELIUM:   out << "MMcEvt::kHELIUM";   break;
     147    case MMcEvt::kOXYGEN:   out << "MMcEvt::kOXYGEN";   break;
     148    case MMcEvt::kIRON:     out << "MMcEvt::kIRON";     break;
    157149    default:
    158150        out << fValue;

  • trunk/MagicSoft/Mars/mhist/MHCompProb.cc

    r2173 r3325  
    168168    {
    169169    case 0:  // First loop : fill the fixed-bin histograms with gammas.
    170         if (mcevt.GetPartId() == kGAMMA)
     170        if (mcevt.GetPartId() == MMcEvt::kGAMMA)
    171171            Fill(*fHists);
    172172        return kTRUE;
    173173
    174174    case 1:   //  Second Loop: fill the variable-bin histograms with protons.
    175         if (mcevt.GetPartId() != kGAMMA)
     175        if (mcevt.GetPartId() != MMcEvt::kGAMMA)
    176176            Fill(*fHistVar);
    177177        return kTRUE;

  • trunk/MagicSoft/Mars/mhist/MHEvent.cc

    r3239 r3325  
    237237        TString txt("#splitline{");
    238238
    239         switch (fMcEvt->GetPartId())
    240         {
    241         case kGAMMA:
    242             txt += "Gamma: ";
    243             break;
    244         case kPROTON:
    245             txt += "Proton: ";
    246             break;
    247         case kHELIUM:
    248             txt += "Helium: ";
    249             break;
    250         default:
    251             s += "Particle Id#";
    252             s += fMcEvt->GetPartId();
    253             s += ": ";
    254         }
     239        txt += fMcEvt->GetParticleName();
    255240
    256241        s.Insert(0, txt);
    … …  
    258243        s += "}{  E=";
    259244
    260         if (fMcEvt->GetEnergy()>1000)
    261             s += Form("%.1fTeV", fMcEvt->GetEnergy()/1000);
    262         else
    263             if (fMcEvt->GetEnergy()>10)
    264                 s += Form("%dGeV", (Int_t)(fMcEvt->GetEnergy()+.5));
    265             else
    266                 if (fMcEvt->GetEnergy()>1)
    267                     s += Form("%.1fGeV", fMcEvt->GetEnergy());
    268                 else
    269                     s += Form("%dMeV", (Int_t)(fMcEvt->GetEnergy()*1000+.5));
     245        s+= fMcEvt->GetEnergyStr();
    270246
    271247        s += " r=";

  • trunk/MagicSoft/Mars/mhist/MHHadronness.cc

    r2522 r3325  
    216216    const Int_t particleid = fMatrix ? (Int_t)(*fMatrix)[fMap] : fMcEvt->GetPartId();
    217217
    218     if (particleid==kGAMMA)
     218    if (particleid==MMcEvt::kGAMMA)
    219219        fGhness->Fill(h, w);
    220220    else

  • trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

    r2207 r3325  
    332332        switch (fPartId)
    333333        {
    334         case kPROTON:
     334        case MMcEvt::kPROTON:
    335335          if ((Int_t)floor(-100*fMcCorRunHeader->GetSlopeSpec()+0.5) != 275)
    336336            {
    337                 *fLog << err << dbginf << "Spectrum slope as read from input file (";
     337                *fLog << err << "Spectrum slope as read from input file (";
    338338                *fLog << fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected ";
    339339                *fLog << "one (-2.75) for protons" << endl << "... aborting." << endl;
    … …  
    342342          rate.SetFlux(0.1091, 2.75);
    343343          break;
    344         case kHELIUM:
     344        case MMcEvt::kHELIUM:
    345345          if ((Int_t)floor(-100*fMcCorRunHeader->GetSlopeSpec()+0.5) != 262)
    346346            {
    347                 *fLog << err << dbginf << "Spectrum slope as read from input file (";
     347                *fLog << err << "Spectrum slope as read from input file (";
    348348                *fLog << fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected ";
    349349                *fLog << "one (-2.62) for Helium" << endl << "... aborting." << endl;
    … …  
    353353          break;
    354354        default:
    355           *fLog << err << dbginf << "Unknown incident flux parameters for ";
     355          *fLog << err << "Unknown incident flux parameters for ";
    356356          *fLog << fPartId<< " particle Id ... aborting." << endl;
    357357          return kFALSE;

  • trunk/MagicSoft/Mars/mranforest/MHRanForest.cc

    r2516 r3325  
    9090    if (!fMcEvt)
    9191    {
    92         TString str =  AddSerialNumber("MMcEvt");
    93         str += " not found... aborting.";
    94         *fLog << err << dbginf << str << endl;
     92        *fLog << err << AddSerialNumber("MMcEvt") << " not found... aborting." << endl;
    9593        return kFALSE;
    9694    }
    … …  
    9997    if (!fRanForest)
    10098    {
    101         *fLog << err << dbginf << "MRanForest not found... aborting." << endl;
     99        *fLog << err << "MRanForest not found... aborting." << endl;
    102100        return kFALSE;
    103101    }
    … …  
    116114
    117115    Double_t hest=0;
    118     Double_t htrue=fMcEvt->GetPartId()==kGAMMA ? 0. : 1.;
     116    Double_t htrue=fMcEvt->GetPartId()==MMcEvt::kGAMMA ? 0. : 1.;
    119117
    120118    Int_t ntrees=fRanForest->GetNumTrees();

  • trunk/MagicSoft/Mars/msignal/Makefile

    r3322 r3325  
    2222#  connect the include files defined in the config.mk file
    2323#
    24 INCLUDES =  -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
    25            -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
    26            -I../mhistmc -I../mfileio -I../mmain -I../mcalib          \
    27            -I../mpointing -I../mtools -I../manalysis
     24INCLUDES =  -I. -I../mbase -I../mgui -I../mraw -I../manalysis \
     25            -I../mgeom -I../mtools
    2826
    29 # mgui (MCamEvent), mgeom(MGeomCam)
     27# mgui (MCamEvent):         MExtractSignalCam
     28# mgeom(MGeomCam):          MArrivalTime
     29# mtools(MCubicSpline):     MArrivalTime
     30# mraw (MRawEvtData):       MExtractSignal
     31# manalysis (MPedestalCam): MExtractSignal
    3032
    3133#------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.