Fork me on GitHub

Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/Weighter.cc

    r341014c rcab38f6  
    1717 */
    1818
     19
    1920/** \class Weighter
    2021 *
     
    3132#include "classes/DelphesFormula.h"
    3233
     34#include "ExRootAnalysis/ExRootResult.h"
     35#include "ExRootAnalysis/ExRootFilter.h"
    3336#include "ExRootAnalysis/ExRootClassifier.h"
    34 #include "ExRootAnalysis/ExRootFilter.h"
    35 #include "ExRootAnalysis/ExRootResult.h"
    3637
     38#include "TMath.h"
     39#include "TString.h"
     40#include "TFormula.h"
     41#include "TRandom3.h"
     42#include "TObjArray.h"
    3743#include "TDatabasePDG.h"
    38 #include "TFormula.h"
    3944#include "TLorentzVector.h"
    40 #include "TMath.h"
    41 #include "TObjArray.h"
    42 #include "TRandom3.h"
    43 #include "TString.h"
    4445
    4546#include <algorithm>
     47#include <stdexcept>
    4648#include <iostream>
    4749#include <sstream>
    48 #include <stdexcept>
    4950
    5051using namespace std;
     
    5253//------------------------------------------------------------------------------
    5354
    54 bool Weighter::TIndexStruct::operator<(const Weighter::TIndexStruct &value) const
     55bool Weighter::TIndexStruct::operator< (const Weighter::TIndexStruct &value) const
    5556{
    5657  Int_t i;
     
    8990  fWeightSet.clear();
    9091
     92
    9193  // set default weight value
    9294  fWeightMap.clear();
    93   memset(index.codes, 0, 4 * sizeof(Int_t));
     95  memset(index.codes, 0, 4*sizeof(Int_t));
    9496  fWeightMap[index] = 1.0;
    9597
     
    9799  param = GetParam("Weight");
    98100  size = param.GetSize();
    99   for(i = 0; i < size / 2; ++i)
     101  for(i = 0; i < size/2; ++i)
    100102  {
    101     paramCodes = param[i * 2];
     103    paramCodes = param[i*2];
    102104    sizeCodes = paramCodes.GetSize();
    103     weight = param[i * 2 + 1].GetDouble();
     105    weight = param[i*2 + 1].GetDouble();
    104106
    105107    if(sizeCodes < 1 || sizeCodes > 4)
     
    108110    }
    109111
    110     memset(index.codes, 0, 4 * sizeof(Int_t));
     112    memset(index.codes, 0, 4*sizeof(Int_t));
    111113
    112114    for(j = 0; j < sizeCodes; ++j)
     
    155157  fCodeSet.clear();
    156158  fItInputArray->Reset();
    157   while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
     159  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
    158160  {
    159161    if(candidate->Status != 3) continue;
     
    165167
    166168  // find default weight value
    167   memset(index.codes, 0, 4 * sizeof(Int_t));
     169  memset(index.codes, 0, 4*sizeof(Int_t));
    168170  itWeightMap = fWeightMap.find(index);
    169171  weight = itWeightMap->second;
Note: See TracChangeset for help on using the changeset viewer.